avformat/flvdec: add support for legacy HEVC files

Timo Rothenpieler committed 1 year ago

Commit b76053d1 parent 5cd49e13 files · +8 −3Browse files

Unified · Split

3 files

@@ -117,6 +117,9 @@ enum { · 116 unmodified lines
117	FLV_CODECID_H264 = 7,	117	FLV_CODECID_H264 = 7,
118	FLV_CODECID_REALH263= 8,	118	FLV_CODECID_REALH263= 8,
119	FLV_CODECID_MPEG4 = 9,	119	FLV_CODECID_MPEG4 = 9,
		120
		121	// non-standard protocol extension that is in use in the wild
		122	FLV_CODECID_X_HEVC = 12,
120	};	123	};
121		124
122	enum {	125	enum {

         return 1;
     switch (flv_codecid) {
+    case FLV_CODECID_X_HEVC:
     case MKBETAG('h', 'v', 'c', '1'):
         return vpar->codec_id == AV_CODEC_ID_HEVC;
     case MKBETAG('a', 'v', '0', '1'):
     enum AVCodecID old_codec_id = vstream->codecpar->codec_id;
     switch (flv_codecid) {
+    case FLV_CODECID_X_HEVC:
     case MKBETAG('h', 'v', 'c', '1'):
         par->codec_id = AV_CODEC_ID_HEVC;
         vstreami->need_parsing = AVSTREAM_PARSE_HEADERS;
             }
             if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4 ||
-                (st->codecpar->codec_id == AV_CODEC_ID_H264 && (!enhanced_flv || type == PacketTypeCodedFrames)) ||
+                ((st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_HEVC) &&
-                (st->codecpar->codec_id == AV_CODEC_ID_HEVC && type == PacketTypeCodedFrames)) {
+                 (!enhanced_flv || type == PacketTypeCodedFrames))) {
                 // sign extension
                 int32_t cts = (avio_rb24(s->pb) + 0xff800000) ^ 0xff800000;
                 pts = av_sat_add64(dts, cts);

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	#include "version_major.h"	32	#include "version_major.h"
33		33
34	#define LIBAVFORMAT_VERSION_MINOR 9	34	#define LIBAVFORMAT_VERSION_MINOR 9
35	#define LIBAVFORMAT_VERSION_MICRO 104	35	#define LIBAVFORMAT_VERSION_MICRO 105
36		36
37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
38	LIBAVFORMAT_VERSION_MINOR, \	38	LIBAVFORMAT_VERSION_MINOR, \

Keyboard shortcuts