matroska: Support >3 chars for Language and add LanguageIETF #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ght or might not handle returning any completed demuxed packets correctly
…then none at all.
This allows user code to properly detect HW decoding compat before decoding actually starts.
In this mode, the parser does completely process the frame, but timestamps are not mangled in compute_pkt_fields.
…pt PMT that isn't current
This allows detection of some files with corruption within the first few MB and should not have a speed impact on previous functional files.
Using multi-threading for stream probing is a bad idea.
…ow network device
This is used by the BDMV demuxer when some streams are not detected by auto-probing
… are still unknown.
This unbreaks compilation in mingw with CRLF line endings
Alot of files have their DefaultDuration set to an calculated value which is not directly tied to the FPS, and because Matroska actually doesn't specify the DefaultDuration to be tied to the FPS, this is perfectly legal. So, before assuming the DefaultDuration is the FPS, check if the value actually makes sense. The most basic check here is that the FPS is below 125fps, because any more really doesn't make sense. If the FPS from the header is not set, avformat will probe the FPS based on the files timestamps, which will give a much better result.
This avoids using an uninitialized picture in further decode calls.
…tes otherwise According to the H.264 standard, Annex D, Table D-1, field_pic_flag shall be 0 when sei_pic_struct signals progressive. In the case when this restriction is not fullfilled, its safer to assume the field is actually interlaced. Not doing so can cause a renderer to assume the frame is progressive and not deinterlace it, even if required.
…o cause a implicit decoder flush
clsid2
force-pushed
the
master
branch
2 times, most recently
from
0c1bfd2
to
274a876
Compare
|
@adipose: Is there something of this patch that can be ported upstream ( https://ffmpeg.org/ )? |
|
I refuse to use mailing lists for code contributions. It's such a poorly designed interface and about 8 years out of date for collaboration. I have been on a few in the past and I really hate digging through emails to find things later. So...you have my blessing if you want to submit my code to the ffmpeg mailing list and see if they'll accept a patch. They also rejected my PR here: FFmpeg/FFmpeg#353 and I was too lazy to submit via mailing list. |
|
@adipose: Beside that (that I can do when I have time) I wonder if you know if there is something that can be ported since if I'm not wrong the "matroskadec_haali.c" was deprecated in main ffmpeg and replaced with something else. |
|
matroskadec_haali has never been part of FFmpeg |
clsid2
pushed a commit
that referenced
this pull request
Dec 27, 2021
…ion parameter
If memory allocation fails, ERROR(ENOMEM) '-12' will be returned.
When resample() is done first, the negative size param would cause buffer-overflow and SEGV in swri_rematrix().
When swri_rematrix() is run first, resample() would not cause an error but Err num as a wrong parameter passing.
Err num should be returned immediately. And remove an unneeded term from an assert.
coredump info:
#0 0x499517 in posix_memalign (/home/r1/ffmpeg/ffmpeg_4.4.1+0x499517)
#1 0x6c1f0b4 in av_malloc /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavutil/mem.c:86:9
#2 0x6c208fe in av_mallocz /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavutil/mem.c:239:17
#3 0x6c207ad in av_mallocz_array /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavutil/mem.c:195:12
#4 0x654b2e5 in swri_realloc_audio /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libswresample/swresample.c:418:14
#5 0x654f9a1 in swr_convert_internal /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libswresample/swresample.c:601:17
#6 0x654d2c0 in swr_convert /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libswresample/swresample.c:766:19
#7 0x186cf56 in flush_frame /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/af_aresample.c:251:13
#8 0x186a454 in request_frame /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/af_aresample.c:288:20
#9 0x787d9c in ff_request_frame_to_filter /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/avfilter.c:459:15
#10 0x7877f1 in forward_status_change /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/avfilter.c:1257:19
#11 0x77ed7e in ff_filter_activate_default /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/avfilter.c:1288:20
#12 0x77e4e1 in ff_filter_activate /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/avfilter.c:1441:11
#13 0x793b3f in ff_filter_graph_run_once /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/avfiltergraph.c:1403:12
#14 0x7a7bee in get_frame_internal /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/buffersink.c:131:19
#15 0x7a7287 in av_buffersink_get_frame_flags /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/buffersink.c:142:12
#16 0x792888 in avfilter_graph_request_oldest /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/libavfilter/avfiltergraph.c:1356:17
#17 0x5d07df in transcode_from_filter /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/fftools/ffmpeg.c:4639:11
#18 0x59e557 in transcode_step /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/fftools/ffmpeg.c:4729:20
#19 0x593970 in transcode /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/fftools/ffmpeg.c:4805:15
#20 0x58f7a4 in main /home/r1/ffmpeg/ffmpeg-4.4.1/build/src/fftools/ffmpeg.c:5010:9
#21 0x7f6fd2dee0b2 in __libc_start_main /build/glibc-eX1tMB/glibc-2.31/csu/../csu/libc-start.c:308:16
SUMMARY: AddressSanitizer: negative-size-param (/home/r1/ffmpeg/ffmpeg_4.4.1+0x497e67) in __asan_memcpy
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
clsid2
force-pushed
the
master
branch
2 times, most recently
from
b4c554a
to
48d7adb
Compare
clsid2
force-pushed
the
master
branch
2 times, most recently
from
23cdfea
to
3a15ce0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Matroska language strings are not limited to 3 characters, and support tags like en-US, etc. Using only 3 characters leads to funny strings like "en-". Given that LAVFilters doesn't support that format of languages, I simply truncate those to "en".
Also added LanguageIETF which is a supported Matroska tag for BCP-47 languages. When using this, set the new "langType" to identify it as BCP-47.