diff options
| author | Zhao Zhili <zhilizhao@tencent.com> | 2023-06-08 10:45:56 +0800 |
|---|---|---|
| committer | Zhao Zhili <zhilizhao@tencent.com> | 2023-06-12 20:09:33 +0800 |
| commit | 1460acc2ac4c5687742b0fdfc9af89f9f0d28029 (patch) | |
| tree | ba140844256ca2d6914a54fe5080a765a57e5980 /libavformat/hlsenc.c | |
| parent | 09621fd7d93a12974e9664b2aebb8237e5c46f03 (diff) | |
| download | ffmpeg-1460acc2ac4c5687742b0fdfc9af89f9f0d28029.tar.gz | |
avformat/hlsenc: fix CODECS attribute of H.264
1. Add avcc extradata support.
2. Add non-standard annexb support with 0 0 1 as prefix for SPS.
Reviewed-by: Limin Wang <lance.lmwang@gmail.com>
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
Diffstat (limited to 'libavformat/hlsenc.c')
| -rw-r--r-- | libavformat/hlsenc.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 871afb571b..1e0848ce3d 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -355,9 +355,19 @@ static void write_codec_attr(AVStream *st, VariantStream *vs) if (st->codecpar->codec_id == AV_CODEC_ID_H264) { uint8_t *data = st->codecpar->extradata; - if (data && (data[0] | data[1] | data[2]) == 0 && data[3] == 1 && (data[4] & 0x1F) == 7) { + if (data) { + const uint8_t *p; + + if (AV_RB32(data) == 0x01 && (data[4] & 0x1F) == 7) + p = &data[5]; + else if (AV_RB24(data) == 0x01 && (data[3] & 0x1F) == 7) + p = &data[4]; + else if (data[0] == 0x01) /* avcC */ + p = &data[1]; + else + goto fail; snprintf(attr, sizeof(attr), - "avc1.%02x%02x%02x", data[5], data[6], data[7]); + "avc1.%02x%02x%02x", p[0], p[1], p[2]); } else { goto fail; } |