diff mbox series

[FFmpeg-devel] avformat/mov: add AVFMT_SHOW_IDS flag

Message ID 20210820114252.7058-1-ffmpeg@gyani.pro
State New
Headers show
Series [FFmpeg-devel] avformat/mov: add AVFMT_SHOW_IDS flag | expand

Checks

Context Check Description
andriy/configure warning Failed to apply patch

Commit Message

Gyan Doshi Aug. 20, 2021, 11:42 a.m. UTC 
The MOV muxer can store streamids as track ids but they aren't
visible when probing the result via lavf/dump or ffprobe due to
lack of this flag in the demuxer.
---
 libavformat/mov.c                                         | 2 +-
 tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov | 2 +-
 tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov         | 2 +-
 tests/ref/fate/mov-zombie                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

 ons=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264
 side_data|side_data_type=Display Matrix|displaymatrix=\n00000000:       131072           0           0\n00000001:            0       65536           0\n00000002:            0           0  1073741824\n|rotation=0

Comments

Gyan Doshi Aug. 21, 2021, 5:20 a.m. UTC | #1 
The RFC was posted 10 days ago. Plan to push tomorrow.

On 2021-08-20 05:12 pm, Gyan Doshi wrote:
> The MOV muxer can store streamids as track ids but they aren't
> visible when probing the result via lavf/dump or ffprobe due to
> lack of this flag in the demuxer.
> ---
>   libavformat/mov.c                                         | 2 +-
>   tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov | 2 +-
>   tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov         | 2 +-
>   tests/ref/fate/mov-zombie                                 | 2 +-
>   4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/libavformat/mov.c b/libavformat/mov.c
> index 46bc7b5aa3..c556390525 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c
> @@ -8216,5 +8216,5 @@ const AVInputFormat ff_mov_demuxer = {
>       .read_packet    = mov_read_packet,
>       .read_close     = mov_read_close,
>       .read_seek      = mov_read_seek,
> -    .flags          = AVFMT_NO_BYTE_SEEK | AVFMT_SEEK_TO_PTS,
> +    .flags          = AVFMT_NO_BYTE_SEEK | AVFMT_SEEK_TO_PTS | AVFMT_SHOW_IDS,
>   };
> diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
> index 4ef569df89..8d21c396fc 100644
> --- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
> +++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
> @@ -36,7 +36,7 @@ color_primaries=unknown
>   chroma_location=unspecified
>   field_order=unknown
>   refs=1
> -id=N/A
> +id=0x1
>   r_frame_rate=25/1
>   avg_frame_rate=25/1
>   time_base=1/12800
> diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
> index 70e7cdc943..6f1f7c543f 100644
> --- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
> +++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
> @@ -36,7 +36,7 @@ color_primaries=unknown
>   chroma_location=unspecified
>   field_order=unknown
>   refs=1
> -id=N/A
> +id=0x1
>   r_frame_rate=25/1
>   avg_frame_rate=25/1
>   time_base=1/12800
> diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie
> index 6e6d43d563..b6656de744 100644
> --- a/tests/ref/fate/mov-zombie
> +++ b/tests/ref/fate/mov-zombie
> @@ -194,5 +194,5 @@ frame|media_type=video|stream_index=0|key_frame=0|pts=188623|pts_time=2.095811|p
>   packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|size=580|pos=101820|flags=__
>   frame|media_type=video|stream_index=0|key_frame=0|pts=191626|pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleftside_data|side_data_type=H.26[45] User Data Unregistered SEI message
>   
> -stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:cap
 ti
>   ons=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264
> +stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=0x1|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:cap
 ti
>   ons=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264
>   side_data|side_data_type=Display Matrix|displaymatrix=\n00000000:       131072           0           0\n00000001:            0       65536           0\n00000002:            0           0  1073741824\n|rotation=0
Gyan Doshi Aug. 22, 2021, 12:29 p.m. UTC | #2 
Pushed as d905af0c2409c854dcd45a05fe4caf9ac49d82ad

On 2021-08-21 10:50 am, Gyan Doshi wrote:
> The RFC was posted 10 days ago. Plan to push tomorrow.
>
> On 2021-08-20 05:12 pm, Gyan Doshi wrote:
>> The MOV muxer can store streamids as track ids but they aren't
>> visible when probing the result via lavf/dump or ffprobe due to
>> lack of this flag in the demuxer.
>> ---
>>   libavformat/mov.c                                         | 2 +-
>>   tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov | 2 +-
>>   tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov         | 2 +-
>>   tests/ref/fate/mov-zombie                                 | 2 +-
>>   4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavformat/mov.c b/libavformat/mov.c
>> index 46bc7b5aa3..c556390525 100644
>> --- a/libavformat/mov.c
>> +++ b/libavformat/mov.c
>> @@ -8216,5 +8216,5 @@ const AVInputFormat ff_mov_demuxer = {
>>       .read_packet    = mov_read_packet,
>>       .read_close     = mov_read_close,
>>       .read_seek      = mov_read_seek,
>> -    .flags          = AVFMT_NO_BYTE_SEEK | AVFMT_SEEK_TO_PTS,
>> +    .flags          = AVFMT_NO_BYTE_SEEK | AVFMT_SEEK_TO_PTS | 
>> AVFMT_SHOW_IDS,
>>   };
>> diff --git 
>> a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov 
>> b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
>> index 4ef569df89..8d21c396fc 100644
>> --- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
>> +++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
>> @@ -36,7 +36,7 @@ color_primaries=unknown
>>   chroma_location=unspecified
>>   field_order=unknown
>>   refs=1
>> -id=N/A
>> +id=0x1
>>   r_frame_rate=25/1
>>   avg_frame_rate=25/1
>>   time_base=1/12800
>> diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov 
>> b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
>> index 70e7cdc943..6f1f7c543f 100644
>> --- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
>> +++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
>> @@ -36,7 +36,7 @@ color_primaries=unknown
>>   chroma_location=unspecified
>>   field_order=unknown
>>   refs=1
>> -id=N/A
>> +id=0x1
>>   r_frame_rate=25/1
>>   avg_frame_rate=25/1
>>   time_base=1/12800
>> diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie
>> index 6e6d43d563..b6656de744 100644
>> --- a/tests/ref/fate/mov-zombie
>> +++ b/tests/ref/fate/mov-zombie
>> @@ -194,5 +194,5 @@ 
>> frame|media_type=video|stream_index=0|key_frame=0|pts=188623|pts_time=2.095811|p
>> packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|size=580|pos=101820|flags=__
>> frame|media_type=video|stream_index=0|key_frame=0|pts=191626|pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleftside_data|side_data_type=H.26[45] 
>> User Data Unregistered SEI message
>> -stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:cap
> ti
>> ons=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple 
>> Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264
>> +stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=0x1|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:cap 
>>
> ti
>> ons=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple 
>> Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264
>>   side_data|side_data_type=Display 
>> Matrix|displaymatrix=\n00000000:       131072 0           
>> 0\n00000001:            0       65536 0\n00000002:            
>> 0           0  1073741824\n|rotation=0
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 46bc7b5aa3..c556390525 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -8216,5 +8216,5 @@  const AVInputFormat ff_mov_demuxer = {
     .read_packet    = mov_read_packet,
     .read_close     = mov_read_close,
     .read_seek      = mov_read_seek,
-    .flags          = AVFMT_NO_BYTE_SEEK | AVFMT_SEEK_TO_PTS,
+    .flags          = AVFMT_NO_BYTE_SEEK | AVFMT_SEEK_TO_PTS | AVFMT_SHOW_IDS,
 };
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
index 4ef569df89..8d21c396fc 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapalphaonly-mov
@@ -36,7 +36,7 @@  color_primaries=unknown
 chroma_location=unspecified
 field_order=unknown
 refs=1
-id=N/A
+id=0x1
 r_frame_rate=25/1
 avg_frame_rate=25/1
 time_base=1/12800
diff --git a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
index 70e7cdc943..6f1f7c543f 100644
--- a/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
+++ b/tests/ref/fate/hapqa-extract-nosnappy-to-hapq-mov
@@ -36,7 +36,7 @@  color_primaries=unknown
 chroma_location=unspecified
 field_order=unknown
 refs=1
-id=N/A
+id=0x1
 r_frame_rate=25/1
 avg_frame_rate=25/1
 time_base=1/12800
diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie
index 6e6d43d563..b6656de744 100644
--- a/tests/ref/fate/mov-zombie
+++ b/tests/ref/fate/mov-zombie
@@ -194,5 +194,5 @@  frame|media_type=video|stream_index=0|key_frame=0|pts=188623|pts_time=2.095811|p
 packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|size=580|pos=101820|flags=__
 frame|media_type=video|stream_index=0|key_frame=0|pts=191626|pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleftside_data|side_data_type=H.26[45] User Data Unregistered SEI message
 
-stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:capti
 ons=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Video Media Handler|tag:vendor_id=appl|tag:encoder=H.264
+stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|closed_captions=0|has_b_frames=1|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|refs=2|is_avc=true|nal_length_size=4|id=0x1|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:capti