xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 20:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
Fork of FFmpeg for xenia's usage. Branched from latest release. On changes use a git rebase strategy when applicable!
94,546 Commits 31 Branches 338 Tags 298 MiB
C 91.6%
Assembly 6.5%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
d770e0f401
Go to file
Marton Balint d770e0f401 avformat/mpegtsenc: fix incorrect PCR selection with multiple programs 
The MPEG-TS muxer had a serious bug related to the use of multiple programs:
in that case, the PCR pid selection was incomplete for all services except one.
This patch solves this problem and selects a stream to become PCR for each
service, preferably the video stream.

This patch also moves pcr calculation attributes to MpegTSWriteStream from
MpegTSService. PCR is a per-stream and not per-service thing, so it was
misleading to refer to it as something that is per-service.

Also remove *service from MpegTSWriteStream because a stream can belong to
multiple services so it was misleading to select one for each stream.

You can check the result with this example command:

./ffmpeg -loglevel verbose -y -f lavfi -i \
  "testsrc=s=64x64:d=10,split=2[out0][tmp1];[tmp1]vflip[out1];sine=d=10,asetnsamples=1152[out2]" \
  -flags +bitexact -fflags +bitexact -sws_flags +accurate_rnd+bitexact  \
  -codec:v libx264 -codec:a mp2 -pix_fmt yuv420p \
  -map '0✌️0' \
  -map '0✌️1' \
  -map '0🅰️0'  \
  -program st=0:st=2 -program st=1:st=2 -program st=2 -program st=0 -f mpegts out.ts

You should now see this:

[mpegts @ 0x37505c0] service 1 using PCR in pid=256
[mpegts @ 0x37505c0] service 2 using PCR in pid=257
[mpegts @ 0x37505c0] service 3 using PCR in pid=258
[mpegts @ 0x37505c0] service 4 using PCR in pid=256

Fixes ticket #8039.

v2: a video is stream is preferred if there are no programs, just like before
the patch.

Signed-off-by: Marton Balint <cus@passwd.hu>
2019-08-14 22:50:11 +02:00
compat compat/cuda: Change inclusion guards 2019-08-05 12:07:09 +02:00
doc libavfilter/vf_scale: Ensure scaled video is divisible by n 2019-08-13 16:48:38 +02:00
ffbuild build: add support for building CUDA files with clang 2019-08-04 19:08:08 +02:00
fftools ffplay: properly detect all window size changes 2019-08-14 21:57:46 +02:00
libavcodec avcodec/indeo2: Check remaining input more often 2019-08-13 22:14:03 +02:00
libavdevice lavd/v4l2: produce a 0 byte packet when a dequeued buffer's size is unexpected 2019-07-30 12:05:52 +02:00
libavfilter avfilter/vf_convolution: Fix build failures 2019-08-14 14:37:47 +08:00
libavformat avformat/mpegtsenc: fix incorrect PCR selection with multiple programs 2019-08-14 22:50:11 +02:00
libavresample avresample: remove deprecated attribute from the AVAudioResampleContext struct 2018-01-09 10:56:53 -03:00
libavutil avutil/mips: refine msa macros CLIP_*. 2019-08-13 16:48:38 +02:00
libpostproc Bump minor versions again on master to keep 4.2 versions separate from master 2019-07-21 18:36:31 +02:00
libswresample Bump minor versions again on master to keep 4.2 versions separate from master 2019-07-21 18:36:31 +02:00
libswscale lsws/ppc/yuv2rgb_altivec: Replace vec_lvsl/vec_perm with vec_xl 2019-08-13 02:21:24 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests fate: add a case for ticket #3229 2019-08-13 10:46:20 +08:00
tools tools/target_dec_fuzzer: Print max_pixels and iterations at the end 2019-08-13 16:48:38 +02:00
.gitattributes fate: add SCC test 2017-01-27 17:06:42 +01:00
.gitignore tools/python: add script to convert TensorFlow model (.pb) to native model (.model) 2019-07-01 10:23:47 -03:00
.travis.yml Merge commit '899ee03088d55152a48830df0899887f055da1de' 2019-03-14 15:53:16 -03:00
Changelog build: add support for building CUDA files with clang 2019-08-04 19:08:08 +02:00
configure lavc/videotoolboxenc: add hdr10, linear, hlg color transfer function for videotoolboxenc 2019-08-11 10:52:15 -04:00
CONTRIBUTING.md Add CONTRIBUTING.md 2016-09-18 10:02:13 +01:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
INSTALL.md INSTALL.md: Fix Markdown formatting 2019-01-31 10:29:16 -09:00
LICENSE.md LICENSE: Add missing libraries that need --enable-version3. 2019-08-12 02:25:39 +02:00
MAINTAINERS MAINTAINERS: Add my GnuPG fingerprint. 2019-08-11 12:08:15 +02:00
Makefile tools: Add fuzzer for demuxers 2019-05-31 22:44:30 +02:00
README.md Remove the ffserver program 2018-01-06 18:31:37 +00:00
RELEASE RELEASE: Update value for post 4.2 branch 2019-07-21 18:37:32 +02:00

README.md

FFmpeg README

FFmpeg is a collection of libraries and tools to process multimedia content such as audio, video, subtitles and related metadata.

Libraries

  • libavcodec provides implementation of a wider range of codecs.
  • libavformat implements streaming protocols, container formats and basic I/O access.
  • libavutil includes hashers, decompressors and miscellaneous utility functions.
  • libavfilter provides a mean to alter decoded Audio and Video through chain of filters.
  • libavdevice provides an abstraction to access capture and playback devices.
  • libswresample implements audio mixing and resampling routines.
  • libswscale implements color conversion and scaling routines.

Tools

  • ffmpeg is a command line toolbox to manipulate, convert and stream multimedia content.
  • ffplay is a minimalistic multimedia player.
  • ffprobe is a simple analysis tool to inspect multimedia content.
  • Additional small tools such as aviocat, ismindex and qt-faststart.

Documentation

The offline documentation is available in the doc/ directory.

The online documentation is available in the main website and in the wiki.

Examples

Coding examples are available in the doc/examples directory.

License

FFmpeg codebase is mainly LGPL-licensed with optional components licensed under GPL. Please refer to the LICENSE file for detailed information.

Contributing

Patches should be submitted to the ffmpeg-devel mailing list using git format-patch or git send-email. Github pull requests should be avoided because they are not part of our review process and will be ignored.