diff mbox series

[FFmpeg-devel] avformat/hlsenc: support CODECS Attribute in hevc EXT-X-STREAM-INF

Message ID 20201013070559.98122-1-lq@chinaffmpeg.org
State Accepted
Commit a2b1dd0ce301450a47c972745a6b33c4c273aa5d
Headers show
Series [FFmpeg-devel] avformat/hlsenc: support CODECS Attribute in hevc EXT-X-STREAM-INF
Related show

Checks

Context Check Description
andriy/x86_make_warn warning New warnings during build
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make warning Make failed

Commit Message

Steven Liu Oct. 13, 2020, 7:05 a.m. UTC
fix ticket: 8904
parse the SPS from extradata and get profile_tier_level
write the profile_tier_level info into CODECS Attribute

HLS CODECS Attribute reference to :https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendixes

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 libavformat/hlsenc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

Comments

Steven Liu Oct. 20, 2020, 3:44 a.m. UTC | #1
Steven Liu <lq@chinaffmpeg.org> 于2020年10月13日周二 下午3:06写道:
>
> fix ticket: 8904
> parse the SPS from extradata and get profile_tier_level
> write the profile_tier_level info into CODECS Attribute
>
> HLS CODECS Attribute reference to :https://developer.apple.com/documentation/http_live_streaming/hls_authoring_specification_for_apple_devices/hls_authoring_specification_for_apple_devices_appendixes
>
> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
> ---
>  libavformat/hlsenc.c | 48 ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 48 insertions(+)
>
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index cb31d6aed7..7a51b8b320 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -46,6 +46,7 @@
>
>  #include "avformat.h"
>  #include "avio_internal.h"
> +#include "avc.h"
>  #if CONFIG_HTTP_PROTOCOL
>  #include "http.h"
>  #endif
> @@ -337,6 +338,49 @@ static void write_codec_attr(AVStream *st, VariantStream *vs)
>          } else {
>              goto fail;
>          }
> +    } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) {
> +        uint8_t *data = st->codecpar->extradata;
> +        int profile = FF_PROFILE_UNKNOWN;
> +        int level = FF_LEVEL_UNKNOWN;
> +
> +        if (st->codecpar->profile != FF_PROFILE_UNKNOWN)
> +            profile = st->codecpar->profile;
> +        if (st->codecpar->level != FF_LEVEL_UNKNOWN)
> +            level = st->codecpar->level;
> +
> +        /* check the boundary of data which from current position is small than extradata_size */
> +        while (data && (data - st->codecpar->extradata + 5) < st->codecpar->extradata_size) {
> +            /* get HEVC SPS NAL and seek to profile_tier_level */
> +            if (!(data[0] | data[1] | data[2]) && data[3] == 1 && ((data[4] & 0x42) == 0x42)) {
> +                int remain_size = 0;
> +                int rbsp_size = 0;
> +                /* skip start code + nalu header */
> +                data += 6;
> +                /* process by reference General NAL unit syntax */
> +                remain_size = st->codecpar->extradata_size - (data - st->codecpar->extradata);
> +                uint8_t *rbsp_buf = ff_nal_unit_extract_rbsp(data, remain_size, &rbsp_size, 0);
> +                if (!rbsp_buf)
> +                    return;
> +                if (rbsp_size < 13) {
> +                    av_freep(&rbsp_buf);
> +                    break;
> +                }
> +                /* skip sps_video_parameter_set_id   u(4),
> +                 *      sps_max_sub_layers_minus1    u(3),
> +                 *  and sps_temporal_id_nesting_flag u(1) */
> +                profile = rbsp_buf[1] & 0x1f;
> +                /* skip 8 + 8 + 32 + 4 + 43 + 1 bit */
> +                level = rbsp_buf[12];
> +                av_freep(&rbsp_buf);
> +                break;
> +            }
> +            data++;
> +        }
> +        if (st->codecpar->codec_tag == MKTAG('h','v','c','1') &&
> +            profile != FF_PROFILE_UNKNOWN &&
> +            level != FF_LEVEL_UNKNOWN) {
> +            snprintf(attr, sizeof(attr), "%s.%d.4.L%d.B01", av_fourcc2str(st->codecpar->codec_tag), profile, level);
> +        }
>      } else if (st->codecpar->codec_id == AV_CODEC_ID_MP2) {
>          snprintf(attr, sizeof(attr), "mp4a.40.33");
>      } else if (st->codecpar->codec_id == AV_CODEC_ID_MP3) {
> @@ -2247,6 +2291,10 @@ static int hls_write_header(AVFormatContext *s)
>                  continue;
>              }
>              avpriv_set_pts_info(outer_st, inner_st->pts_wrap_bits, inner_st->time_base.num, inner_st->time_base.den);
> +            if (outer_st->codecpar->codec_id == AV_CODEC_ID_HEVC &&
> +                outer_st->codecpar->codec_tag != MKTAG('h','v','c','1')) {
> +                av_log(s, AV_LOG_WARNING, "Stream HEVC is not hvc1, you should use tag:v hvc1 to set it.\n");
> +            }
>              write_codec_attr(outer_st, vs);
>
>          }
> --
> 2.25.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".

Pushed


Thanks
Steven
diff mbox series

Patch

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index cb31d6aed7..7a51b8b320 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -46,6 +46,7 @@ 
 
 #include "avformat.h"
 #include "avio_internal.h"
+#include "avc.h"
 #if CONFIG_HTTP_PROTOCOL
 #include "http.h"
 #endif
@@ -337,6 +338,49 @@  static void write_codec_attr(AVStream *st, VariantStream *vs)
         } else {
             goto fail;
         }
+    } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) {
+        uint8_t *data = st->codecpar->extradata;
+        int profile = FF_PROFILE_UNKNOWN;
+        int level = FF_LEVEL_UNKNOWN;
+
+        if (st->codecpar->profile != FF_PROFILE_UNKNOWN)
+            profile = st->codecpar->profile;
+        if (st->codecpar->level != FF_LEVEL_UNKNOWN)
+            level = st->codecpar->level;
+
+        /* check the boundary of data which from current position is small than extradata_size */
+        while (data && (data - st->codecpar->extradata + 5) < st->codecpar->extradata_size) {
+            /* get HEVC SPS NAL and seek to profile_tier_level */
+            if (!(data[0] | data[1] | data[2]) && data[3] == 1 && ((data[4] & 0x42) == 0x42)) {
+                int remain_size = 0;
+                int rbsp_size = 0;
+                /* skip start code + nalu header */
+                data += 6;
+                /* process by reference General NAL unit syntax */
+                remain_size = st->codecpar->extradata_size - (data - st->codecpar->extradata);
+                uint8_t *rbsp_buf = ff_nal_unit_extract_rbsp(data, remain_size, &rbsp_size, 0);
+                if (!rbsp_buf)
+                    return;
+                if (rbsp_size < 13) {
+                    av_freep(&rbsp_buf);
+                    break;
+                }
+                /* skip sps_video_parameter_set_id   u(4),
+                 *      sps_max_sub_layers_minus1    u(3),
+                 *  and sps_temporal_id_nesting_flag u(1) */
+                profile = rbsp_buf[1] & 0x1f;
+                /* skip 8 + 8 + 32 + 4 + 43 + 1 bit */
+                level = rbsp_buf[12];
+                av_freep(&rbsp_buf);
+                break;
+            }
+            data++;
+        }
+        if (st->codecpar->codec_tag == MKTAG('h','v','c','1') &&
+            profile != FF_PROFILE_UNKNOWN &&
+            level != FF_LEVEL_UNKNOWN) {
+            snprintf(attr, sizeof(attr), "%s.%d.4.L%d.B01", av_fourcc2str(st->codecpar->codec_tag), profile, level);
+        }
     } else if (st->codecpar->codec_id == AV_CODEC_ID_MP2) {
         snprintf(attr, sizeof(attr), "mp4a.40.33");
     } else if (st->codecpar->codec_id == AV_CODEC_ID_MP3) {
@@ -2247,6 +2291,10 @@  static int hls_write_header(AVFormatContext *s)
                 continue;
             }
             avpriv_set_pts_info(outer_st, inner_st->pts_wrap_bits, inner_st->time_base.num, inner_st->time_base.den);
+            if (outer_st->codecpar->codec_id == AV_CODEC_ID_HEVC &&
+                outer_st->codecpar->codec_tag != MKTAG('h','v','c','1')) {
+                av_log(s, AV_LOG_WARNING, "Stream HEVC is not hvc1, you should use tag:v hvc1 to set it.\n");
+            }
             write_codec_attr(outer_st, vs);
 
         }