virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

lavf/mpegtsenc: set metadata stream type and write descriptor for ID3 packets

Browse Source 
This allow to remux data packets which are then recognized as ID3 packets.
This commit is contained in:
Stefano Sabatini 2016-03-26 12:02:49 +01:00
parent 7ecfe4dc36
commit 1ab8e03a45
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/mpegts.h
View File

@ -51,6 +51,7 @@
#define STREAM_TYPE_AUDIO_AAC 0x0f #define STREAM_TYPE_AUDIO_AAC 0x0f
#define STREAM_TYPE_AUDIO_AAC_LATM 0x11 #define STREAM_TYPE_AUDIO_AAC_LATM 0x11
#define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_MPEG4 0x10
#define STREAM_TYPE_METADATA 0x15
#define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_H264 0x1b
#define STREAM_TYPE_VIDEO_HEVC 0x24 #define STREAM_TYPE_VIDEO_HEVC 0x24
#define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_VIDEO_CAVS 0x42

10
libavformat/mpegtsenc.c
View File

@ -353,6 +353,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
case AV_CODEC_ID_OPUS: case AV_CODEC_ID_OPUS:
stream_type = STREAM_TYPE_PRIVATE_DATA; stream_type = STREAM_TYPE_PRIVATE_DATA;
break; break;
case AV_CODEC_ID_TIMED_ID3:
stream_type = STREAM_TYPE_METADATA;
break;
default: default:
stream_type = STREAM_TYPE_PRIVATE_DATA; stream_type = STREAM_TYPE_PRIVATE_DATA;
break; break;
@ -605,6 +608,13 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
*q++ = 'L'; *q++ = 'L';
*q++ = 'V'; *q++ = 'V';
*q++ = 'A'; *q++ = 'A';
} else if (st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) {
*q++ = 0x5; /* MPEG-2 registration descriptor */
*q++ = 4;
*q++ = 'I';
*q++ = 'D';
*q++ = '3';
*q++ = ' ';
} }
break; break;
} }