[FFmpeg-trac] #7956(avformat:new): asf container - HE-AAC stream detected as "unknown: none"

[FFmpeg]

#7956: asf container - HE-AAC stream detected as "unknown: none"
-------------------------------------+------------------------------------
             Reporter:  Djfe         |                    Owner:
                 Type:  enhancement  |                   Status:  new
             Priority:  wish         |                Component:  avformat
              Version:  git-master   |               Resolution:
             Keywords:  asf aac      |               Blocked By:
             Blocking:               |  Reproduced by developer:  0
Analyzed by developer:  0            |
-------------------------------------+------------------------------------
Changes (by cehoyos):

 * keywords:   => asf aac
 * priority:  normal => wish
 * component:  undetermined => avformat
 * type:  defect => enhancement


Comment:

 Please test this patch.
 {{{
 diff --git a/libavformat/asf.c b/libavformat/asf.c
 index 719cae9da5..0f223d2916 100644
 --- a/libavformat/asf.c
 +++ b/libavformat/asf.c
 @@ -105,6 +105,10 @@ const ff_asf_guid ff_asf_ext_stream_audio_stream = {
      0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d,
 0xf9, 0xdb, 0x22, 0xf5, 0x03
  };

 +const ff_asf_guid ff_asf_mediatype_stream = {
 +    0x83, 0xeb, 0x36, 0xe4, 0x4f, 0x52, 0xce, 0x11, 0x9f, 0x53, 0x00,
 0x20, 0xaf, 0x0b, 0xa7, 0x70
 +};
 +
  const ff_asf_guid ff_asf_metadata_header = {
      0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa,
 0x8c, 0x44, 0xfa, 0x4c, 0xca
  };
 diff --git a/libavformat/asf.h b/libavformat/asf.h
 index a30d3bb23b..90ce752bae 100644
 --- a/libavformat/asf.h
 +++ b/libavformat/asf.h
 @@ -90,6 +90,7 @@ extern const ff_asf_guid ff_asf_extended_content_header;
  extern const ff_asf_guid ff_asf_simple_index_header;
  extern const ff_asf_guid ff_asf_ext_stream_embed_stream_header;
  extern const ff_asf_guid ff_asf_ext_stream_audio_stream;
 +extern const ff_asf_guid ff_asf_mediatype_stream;
  extern const ff_asf_guid ff_asf_metadata_header;
  extern const ff_asf_guid ff_asf_metadata_library_header;
  extern const ff_asf_guid ff_asf_marker_header;
 diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c
 index 57dc3b09b9..e1ed48d1a6 100644
 --- a/libavformat/asfdec_f.c
 +++ b/libavformat/asfdec_f.c
 @@ -460,7 +460,8 @@ static int asf_read_stream_properties(AVFormatContext
 *s, int64_t size)

      if (test_for_ext_stream_audio) {
          ff_get_guid(pb, &g);
 -        if (!ff_guidcmp(&g, &ff_asf_ext_stream_audio_stream)) {
 +        if (   !ff_guidcmp(&g, &ff_asf_mediatype_stream)
 +            || !ff_guidcmp(&g, &ff_asf_ext_stream_audio_stream)) {
              type            = AVMEDIA_TYPE_AUDIO;
              is_dvr_ms_audio = 1;
              ff_get_guid(pb, &g);
 }}}

--
Ticket URL: <https://trac.ffmpeg.org/ticket/7956#comment:1>
FFmpeg <https://ffmpeg.org>
FFmpeg issue tracker