Commit Graph

411 Commits

Author SHA1 Message Date
Stefan Seyfried
3d6df50158 generic-pc: add audio sample conversion
ffmpeg audiodecoders after version 1.1 deliver audio samples in planar
formats by default instead of packed as before. Additionally, the AC3
decoder delivers now in planar float.
Use libswresample for sample format conversion, this will work with old
(where it hopefully does nothing) and new ffmpeg versions.
Later on, also sample rate and channel layout conversion could be
implemented if desired.
Tested with ffmpeg versions 1.0.6 and 1.2.1.


Origin commit data
------------------
Branch: master
Commit: f4f72f34b9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)



------------------
This commit was generated by Migit
2013-06-01 13:43:51 +02:00
martii
8c3c46a572 generic-pc/glfb: use r/g/y/b keys as additional color keys
Origin commit data
------------------
Branch: master
Commit: 8b533c3c59
Author: martii <m4rtii@gmx.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-01 12:29:30 +02:00
Stefan Seyfried
a5aeedcb84 fix library declarations for libtool
Origin commit data
------------------
Branch: master
Commit: e5e05ffa09
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-01 12:25:52 +02:00
martii
d5774fcb78 generic-pc: fix audio (2nd try)
Origin commit data
------------------
Branch: master
Commit: a89b6f294e
Author: martii <m4rtii@gmx.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-01 10:37:36 +02:00
martii
1a07c31ec2 generic-pc: fix audio
Origin commit data
------------------
Branch: master
Commit: b8a8c07786
Author: martii <m4rtii@gmx.de>
Date: 2013-05-31 (Fri, 31 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-31 18:08:07 +02:00
martii
ff1d1acfef copy api changes from spark to generic
Origin commit data
------------------
Branch: master
Commit: 4e4dd50bb8
Author: martii <m4rtii@gmx.de>
Date: 2013-05-31 (Fri, 31 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-31 13:27:04 +02:00
martii
2dfbaf80b8 Merge remote-tracking branch 'seife/master'
Origin commit data
------------------
Branch: master
Commit: 0aec8dda78
Author: martii <m4rtii@gmx.de>
Date: 2013-05-27 (Mon, 27 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-27 17:38:35 +02:00
Stefan Seyfried
9db763cac7 configure: specify the needed ffmpeg versions
Origin commit data
------------------
Branch: master
Commit: 7b32a96635
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-27 (Mon, 27 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-27 13:51:09 +02:00
Stefan Seyfried
955d4d651b generic-pc: add Pig function to cVideo / GLFB
Origin commit data
------------------
Branch: master
Commit: 05ac116312
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-27 (Mon, 27 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-27 00:47:35 +02:00
Stefan Seyfried
11b3872cef generic/glfb: add a few keys to F5-F8
Origin commit data
------------------
Branch: master
Commit: 9593fe09cf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-27 (Mon, 27 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-27 00:45:42 +02:00
Stefan Seyfried
53bdc36960 generic-pc/video: implement getScreenImage (experimental)
Origin commit data
------------------
Branch: master
Commit: adb6db1beb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-26 (Sun, 26 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-26 20:52:43 +02:00
Stefan Seyfried
656c2d85c0 generic-pc/video: reuse swscale context
Origin commit data
------------------
Branch: master
Commit: 40d1bb8b63
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-26 (Sun, 26 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-26 20:50:58 +02:00
martii
9b5a05c931 revert audio_mixer changes
Origin commit data
------------------
Branch: master
Commit: 236c2401f1
Author: martii <m4rtii@gmx.de>
Date: 2013-05-26 (Sun, 26 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-26 14:24:31 +02:00
martii
4eb6e7427f libspark/audio_mixer: load alsa-lib temporarily only (fix)
Origin commit data
------------------
Branch: master
Commit: f70b1457cc
Author: martii <m4rtii@gmx.de>
Date: 2013-05-26 (Sun, 26 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-26 12:42:08 +02:00
martii
ece6fc5bd4 libspark/audio_mixer: load alsa-lib temporarily only
Origin commit data
------------------
Branch: master
Commit: c09fc914a4
Author: martii <m4rtii@gmx.de>
Date: 2013-05-26 (Sun, 26 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-26 10:56:08 +02:00
martii
dae031fc4b Merge remote-tracking branch 'seife/master'
Origin commit data
------------------
Branch: master
Commit: 151fd39d45
Author: martii <m4rtii@gmx.de>
Date: 2013-05-26 (Sun, 26 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-26 08:09:50 +02:00
Stefan Seyfried
8febd10a9c triple: fix compile breakage in video.h
Origin commit data
------------------
Branch: master
Commit: 62f0c20738
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-25 (Sat, 25 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 23:13:37 +02:00
Stefan Seyfried
f1d30de477 video: ensure VIDEO_STD_MAX is big enough
Origin commit data
------------------
Branch: master
Commit: b4be13eb84
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-25 (Sat, 25 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 22:05:30 +02:00
martii
1cf11b3a32 libspark/video: use VIDEO_STILLPICTURE with NULL pointer to blank screen
Origin commit data
------------------
Branch: master
Commit: 4e9395f788
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 16:48:30 +02:00
martii
979e4400ea libspark/video: ShowPicture: fix malloc size
Origin commit data
------------------
Branch: master
Commit: 781cf7f389
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 12:53:25 +02:00
martii
beb2e08433 Merge remote-tracking branch 'seife/master'
Origin commit data
------------------
Branch: master
Commit: cde83d893d
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 12:38:21 +02:00
martii
24db08b011 libspark/video: add missing newline
Origin commit data
------------------
Branch: master
Commit: e68c20dfbe
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 11:24:32 +02:00
martii
9d9d703dbd libspark/video: ShowPicture: use VIDEO_STILLPICTURE
Origin commit data
------------------
Branch: master
Commit: 18b798bee2
Author: martii <m4rtii@gmx.de>
Date: 2013-05-25 (Sat, 25 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 08:42:06 +02:00
Stefan Seyfried
635019ca7b generic-pc: add audiplayer support to cAudio
Origin commit data
------------------
Branch: master
Commit: 02ae4f3c44
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-24 22:51:27 +02:00
Stefan Seyfried
3be0426527 generic-pc: implement cVideo::ShowPicture()
Origin commit data
------------------
Branch: master
Commit: 2c813fe1e4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-24 15:48:19 +02:00
Stefan Seyfried
563938c737 generic-pc: without decoding, no PCR demux is needed
Origin commit data
------------------
Branch: master
Commit: f89f5e9ba2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-24 13:04:46 +02:00
martii
749589a583 libspark/video: ShowPicture: add flag to indicate that input file is already m2v and doesn't need to be converted
Origin commit data
------------------
Branch: master
Commit: f88d47b0f2
Author: martii <m4rtii@gmx.de>
Date: 2013-05-18 (Sat, 18 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-18 15:29:19 +02:00
martii
4a6cb3f750 cleanup
Origin commit data
------------------
Branch: master
Commit: a5cc6ae698
Author: martii <m4rtii@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-10 14:01:52 +02:00
Stefan Seyfried
bb0f574e58 generic-pc: allow to disable softdecoder for debugging
Origin commit data
------------------
Branch: master
Commit: 5f0fb850d6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-10 13:37:24 +02:00
Stefan Seyfried
6fb7e1da86 demux: define MAX_DMX_UNITS (not yet used)
Origin commit data
------------------
Branch: master
Commit: 6724f3f9e3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-10 13:22:44 +02:00
Stefan Seyfried
211e79cccf acinclude: fix variable expansion issues
Origin commit data
------------------
Branch: master
Commit: 2b23273b0e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-10 13:22:27 +02:00
Stefan Seyfried
fbb281e681 configure: silence automake warnings
Origin commit data
------------------
Branch: master
Commit: 70d964d588
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-10 13:18:17 +02:00
martii
a258237013 sync
Origin commit data
------------------
Branch: master
Commit: 145b098d92
Author: martii <m4rtii@gmx.de>
Date: 2013-05-06 (Mon, 06 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-06 18:01:49 +02:00
Stefan Seyfried
8cf48de350 GLFB: remove unused 3D cube code
Origin commit data
------------------
Branch: master
Commit: 6336dc4f94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-06 (Mon, 06 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-06 00:32:48 +02:00
Stefan Seyfried
bd55ecb624 GLFB: slightly better fullscreen handling
Origin commit data
------------------
Branch: master
Commit: 9cc35ff0cc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-06 (Mon, 06 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-06 00:25:29 +02:00
Stefan Seyfried
d16e9dd590 GLFB: hide mouse cursor
Origin commit data
------------------
Branch: master
Commit: 2e54579ba6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-06 (Mon, 06 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-06 00:19:45 +02:00
Stefan Seyfried
6f49d0294d cRecord: fix compiler warning (type mismatch)
Origin commit data
------------------
Branch: master
Commit: 88b8aa7b8f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-05 (Sun, 05 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-05 20:14:12 +02:00
Stefan Seyfried
402ec04fcf generic-pc: use HD framebuffer resolution
Use 1280x720 instead of 720x576 as default. The resolution
can be changed via the environment variable GLFB_RESOLUTION.


Origin commit data
------------------
Branch: master
Commit: eb9d2f44ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-05 (Sun, 05 May 2013)



------------------
This commit was generated by Migit
2013-05-05 18:53:41 +02:00
Stefan Seyfried
1a6e19441f generic/cVideo: implement setAspectRatio / setVideoSystem
Origin commit data
------------------
Branch: master
Commit: 4cb2f75305
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-05 (Sun, 05 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-05 18:45:05 +02:00
Stefan Seyfried
77baa42505 GLFB: implement missing functions
* output format (screen size) setting
* aspect ratio setting
* cropping, scaling (letterbox/panscan)
* full screen mode (experimental, hit "f" key)
* add EPG key ("e")


Origin commit data
------------------
Branch: master
Commit: 7c00b1d46b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-05 (Sun, 05 May 2013)



------------------
This commit was generated by Migit
2013-05-05 18:28:53 +02:00
martii
78c97b9f47 Merge remote-tracking branch 'seife/master'
Origin commit data
------------------
Branch: master
Commit: ec3f82441e
Author: martii <m4rtii@gmx.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 20:52:54 +02:00
Stefan Seyfried
c6f2fb2d91 GLFB: add a few sanity checks for sleep interval
Origin commit data
------------------
Branch: master
Commit: 3ce7bc213c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 17:27:01 +02:00
Stefan Seyfried
8e329f1e26 GLFB: fix X window at 16:9 aspect ratio
Origin commit data
------------------
Branch: master
Commit: 631c48e65b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 17:25:31 +02:00
Stefan Seyfried
05951af416 GLFB: add video aspect ratio handling
Origin commit data
------------------
Branch: master
Commit: 9c1419c25b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 17:24:39 +02:00
Stefan Seyfried
6dadad1412 generic-pc/video: improve video decoder
* add aspect ratio reporting
* "correct" buffer PTS by 300ms for better AV-Sync with MPEG2
* remove unneeded stuff


Origin commit data
------------------
Branch: master
Commit: 8a8849f28e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)



------------------
This commit was generated by Migit
2013-05-04 17:21:03 +02:00
Stefan Seyfried
57db8efaf2 generic-pc/glfb: add some sort of A/V synchronization
Origin commit data
------------------
Branch: master
Commit: 569a1495f7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 15:15:21 +02:00
Stefan Seyfried
680c8e9c15 generic-pc/audio: initialize curr_pts
Origin commit data
------------------
Branch: master
Commit: 7cff17cb95
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 15:13:18 +02:00
Stefan Seyfried
3807de2248 generic-pc/dmx: route audio and video to the SW decoders
Origin commit data
------------------
Branch: master
Commit: f87bb0afdd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 12:32:50 +02:00
Stefan Seyfried
b4f93b6fd8 generic-pc: initialize GL framebuffer in init()
Origin commit data
------------------
Branch: master
Commit: ae9d6fd668
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 12:30:23 +02:00
Stefan Seyfried
41d3436ebf generic-pc: add openGL based framebuffer implementation
Origin commit data
------------------
Branch: master
Commit: 06e5987797
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-04 (Sat, 04 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-04 12:25:24 +02:00