[FFmpeg-cvslog] rtpdec: Move setting the parsing flags to the actual depacketizers
Martin Storsjö
git at videolan.org
Mon Jan 21 14:06:26 CET 2013
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Thu Jan 17 15:29:12 2013 +0200| [c6f1dc8e4cd967ae056698eafb891a08003c211c] | committer: Martin Storsjö
rtpdec: Move setting the parsing flags to the actual depacketizers
This gets rid of almost all the codec specific details from the
generic rtpdec code.
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6f1dc8e4cd967ae056698eafb891a08003c211c
---
libavformat/rtpdec.c | 12 ------------
libavformat/rtpdec_h263.c | 10 ++++++++++
libavformat/rtpdec_h263_rfc2190.c | 9 +++++++++
libavformat/rtpdec_h264.c | 9 +++++++++
libavformat/rtpdec_mpeg12.c | 10 ++++++++++
libavformat/rtpdec_mpeg4.c | 9 +++++++++
libavformat/rtpdec_xiph.c | 11 +++++++++++
7 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 38bd333..4379e6f 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -502,18 +502,6 @@ RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
rtp_init_statistics(&s->statistics, 0);
if (st) {
switch (st->codec->codec_id) {
- case AV_CODEC_ID_MPEG1VIDEO:
- case AV_CODEC_ID_MPEG2VIDEO:
- case AV_CODEC_ID_MP2:
- case AV_CODEC_ID_MP3:
- case AV_CODEC_ID_MPEG4:
- case AV_CODEC_ID_H263:
- case AV_CODEC_ID_H264:
- st->need_parsing = AVSTREAM_PARSE_FULL;
- break;
- case AV_CODEC_ID_VORBIS:
- st->need_parsing = AVSTREAM_PARSE_HEADERS;
- break;
case AV_CODEC_ID_ADPCM_G722:
/* According to RFC 3551, the stream clock rate is 8000
* even if the sample rate is 16000. */
diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c
index bdb5195..4b3443b 100644
--- a/libavformat/rtpdec_h263.c
+++ b/libavformat/rtpdec_h263.c
@@ -23,6 +23,14 @@
#include "rtpdec_formats.h"
#include "libavutil/intreadwrite.h"
+static int h263_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
int ff_h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
AVStream *st, AVPacket *pkt, uint32_t *timestamp,
const uint8_t *buf, int len, uint16_t seq, int flags)
@@ -92,6 +100,7 @@ RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler = {
.enc_name = "H263-1998",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_H263,
+ .init = h263_init,
.parse_packet = ff_h263_handle_packet,
};
@@ -99,5 +108,6 @@ RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler = {
.enc_name = "H263-2000",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_H263,
+ .init = h263_init,
.parse_packet = ff_h263_handle_packet,
};
diff --git a/libavformat/rtpdec_h263_rfc2190.c b/libavformat/rtpdec_h263_rfc2190.c
index 4792a9f..4b6e996 100644
--- a/libavformat/rtpdec_h263_rfc2190.c
+++ b/libavformat/rtpdec_h263_rfc2190.c
@@ -55,6 +55,14 @@ static void h263_free_context(PayloadContext *data)
av_free(data);
}
+static int h263_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
AVStream *st, AVPacket *pkt, uint32_t *timestamp,
const uint8_t *buf, int len, uint16_t seq,
@@ -198,6 +206,7 @@ static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_H263,
+ .init = h263_init,
.parse_packet = h263_handle_packet,
.alloc = h263_new_context,
.free = h263_free_context,
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c
index 2df0930..d619e60 100644
--- a/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@ -338,6 +338,14 @@ static void h264_free_context(PayloadContext *data)
av_free(data);
}
+static int h264_init(AVFormatContext *s, int st_index, PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ s->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
static int parse_h264_sdp_line(AVFormatContext *s, int st_index,
PayloadContext *h264_data, const char *line)
{
@@ -383,6 +391,7 @@ RTPDynamicProtocolHandler ff_h264_dynamic_handler = {
.enc_name = "H264",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_H264,
+ .init = h264_init,
.parse_sdp_a_line = parse_h264_sdp_line,
.alloc = h264_new_context,
.free = h264_free_context,
diff --git a/libavformat/rtpdec_mpeg12.c b/libavformat/rtpdec_mpeg12.c
index d111469..4dd98fb 100644
--- a/libavformat/rtpdec_mpeg12.c
+++ b/libavformat/rtpdec_mpeg12.c
@@ -22,6 +22,14 @@
#include "rtpdec_formats.h"
#include "libavutil/intreadwrite.h"
+static int mpeg_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
static int mpeg_parse_packet(AVFormatContext *ctx, PayloadContext *data,
AVStream *st, AVPacket *pkt, uint32_t *timestamp,
const uint8_t *buf, int len, uint16_t seq,
@@ -50,6 +58,7 @@ static int mpeg_parse_packet(AVFormatContext *ctx, PayloadContext *data,
RTPDynamicProtocolHandler ff_mpeg_audio_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = AV_CODEC_ID_MP3,
+ .init = mpeg_init,
.parse_packet = mpeg_parse_packet,
.static_payload_id = 14,
};
@@ -57,6 +66,7 @@ RTPDynamicProtocolHandler ff_mpeg_audio_dynamic_handler = {
RTPDynamicProtocolHandler ff_mpeg_video_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_MPEG2VIDEO,
+ .init = mpeg_init,
.parse_packet = mpeg_parse_packet,
.static_payload_id = 32,
};
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c
index 0172b5b..c2cedcc 100644
--- a/libavformat/rtpdec_mpeg4.c
+++ b/libavformat/rtpdec_mpeg4.c
@@ -252,10 +252,19 @@ static int parse_sdp_line(AVFormatContext *s, int st_index,
return 0;
}
+static int init_video(AVFormatContext *s, int st_index, PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ s->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+ return 0;
+}
+
RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
.enc_name = "MP4V-ES",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_MPEG4,
+ .init = init_video,
.parse_sdp_a_line = parse_sdp_line,
};
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index db39462..8bfe65d 100644
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -70,6 +70,16 @@ static void xiph_free_context(PayloadContext * data)
av_free(data);
}
+static int xiph_vorbis_init(AVFormatContext *ctx, int st_index,
+ PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_HEADERS;
+ return 0;
+}
+
+
static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data,
AVStream *st, AVPacket *pkt, uint32_t *timestamp,
const uint8_t *buf, int len, uint16_t seq,
@@ -392,6 +402,7 @@ RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = {
.enc_name = "vorbis",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = AV_CODEC_ID_VORBIS,
+ .init = xiph_vorbis_init,
.parse_sdp_a_line = xiph_parse_sdp_line,
.alloc = xiph_new_context,
.free = xiph_free_context,
More information about the ffmpeg-cvslog
mailing list