On 23 June 2010 17:04, Michael Niedermayer <[email protected]> wrote: > On Wed, Jun 23, 2010 at 03:57:20PM -0700, Josh Allmann wrote: >> Hi, >> >> On 23 June 2010 14:48, Josh Allmann <[email protected]> wrote: >> > >> > Awesome -- patch 002 in this series also replaces memchr with strspn, >> > as noted by Michael and Ronald. >> > >> >> Updated version attached. >> >> > Josh >> > > > you can call strspn(SPACE_CHARS) directly, you dont need ff_skip_spaces() >
Ohh, nice one. Fixed in both patches that contain ff_skip_spaces. Josh
From ed61fb390d2a811fb87f4c03656a980687e596a7 Mon Sep 17 00:00:00 2001 From: Josh Allmann <[email protected]> Date: Sun, 20 Jun 2010 12:12:22 -0700 Subject: [PATCH 1/6] Remove skip_spaces in favor of strspn. --- libavformat/internal.h | 2 ++ libavformat/rtsp.c | 37 ++++++++++++------------------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 4489ffe..8a164bd 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -174,4 +174,6 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, AVFormatContext *src); +#define SPACE_CHARS " \t\r\n" + #endif /* AVFORMAT_INTERNAL_H */ diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index be63523..f29d727 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -53,19 +53,6 @@ int rtsp_default_protocols = (1 << RTSP_LOWER_TRANSPORT_UDP); #define READ_PACKET_TIMEOUT_S 10 #define MAX_TIMEOUTS READ_PACKET_TIMEOUT_S * 1000 / SELECT_TIMEOUT_MS -#define SPACE_CHARS " \t\r\n" -/* we use memchr() instead of strchr() here because strchr() will return - * the terminating '\0' of SPACE_CHARS instead of NULL if c is '\0'. */ -#define redir_isspace(c) memchr(SPACE_CHARS, c, 4) -static void skip_spaces(const char **pp) -{ - const char *p; - p = *pp; - while (redir_isspace(*p)) - p++; - *pp = p; -} - static void get_word_until_chars(char *buf, int buf_size, const char *sep, const char **pp) { @@ -73,7 +60,7 @@ static void get_word_until_chars(char *buf, int buf_size, char *q; p = *pp; - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); q = buf; while (!strchr(sep, *p) && *p != '\0') { if ((q - buf) < buf_size - 1) @@ -179,7 +166,7 @@ static int hex_to_data(uint8_t *data, const char *p) len = 0; v = 1; for (;;) { - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); if (*p == '\0') break; c = toupper((unsigned char) *p++); @@ -256,7 +243,7 @@ static const AttrNameMap attr_names[]= int ff_rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size) { - skip_spaces(p); + *p += strspn(*p, SPACE_CHARS); if (**p) { get_word_sep(attr, attr_size, "=", p); if (**p == '=') @@ -308,7 +295,7 @@ static void rtsp_parse_range_npt(const char *p, int64_t *start, int64_t *end) { char buf[256]; - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); if (!av_stristart(p, "npt=", &p)) return; @@ -547,7 +534,7 @@ static int sdp_parse(AVFormatContext *s, const char *content) memset(s1, 0, sizeof(SDPParseState)); p = content; for (;;) { - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); letter = *p; if (letter == '\0') break; @@ -727,7 +714,7 @@ static void rtsp_parse_range(int *min_ptr, int *max_ptr, const char **pp) int v; p = *pp; - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); v = strtol(p, (char **)&p, 10); if (*p == '-') { p++; @@ -754,7 +741,7 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p) reply->nb_transports = 0; for (;;) { - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); if (*p == '\0') break; @@ -864,22 +851,22 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf, } else if (av_stristart(p, "Range:", &p)) { rtsp_parse_range_npt(p, &reply->range_start, &reply->range_end); } else if (av_stristart(p, "RealChallenge1:", &p)) { - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); av_strlcpy(reply->real_challenge, p, sizeof(reply->real_challenge)); } else if (av_stristart(p, "Server:", &p)) { - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); av_strlcpy(reply->server, p, sizeof(reply->server)); } else if (av_stristart(p, "Notice:", &p) || av_stristart(p, "X-Notice:", &p)) { reply->notice = strtol(p, NULL, 10); } else if (av_stristart(p, "Location:", &p)) { - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); av_strlcpy(reply->location, p , sizeof(reply->location)); } else if (av_stristart(p, "WWW-Authenticate:", &p) && auth_state) { - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); ff_http_auth_handle_header(auth_state, "WWW-Authenticate", p); } else if (av_stristart(p, "Authentication-Info:", &p) && auth_state) { - skip_spaces(&p); + p += strspn(p, SPACE_CHARS); ff_http_auth_handle_header(auth_state, "Authentication-Info", p); } } -- 1.7.0.4
From fa21da9d476be0de9435bbaa9adff202b78b00dc Mon Sep 17 00:00:00 2001 From: Josh Allmann <[email protected]> Date: Sun, 20 Jun 2010 12:25:59 -0700 Subject: [PATCH 2/6] Decouple MPEG-4 and AAC specific parts from rtsp.c. --- libavformat/Makefile | 1 + libavformat/rtpdec.c | 8 +-- libavformat/rtpdec_mpeg4.c | 125 ++++++++++++++++++++++++++++++++++++++++++++ libavformat/rtpdec_mpeg4.h | 39 ++++++++++++++ libavformat/rtsp.c | 58 -------------------- 5 files changed, 168 insertions(+), 63 deletions(-) create mode 100644 libavformat/rtpdec_mpeg4.c create mode 100644 libavformat/rtpdec_mpeg4.h diff --git a/libavformat/Makefile b/libavformat/Makefile index 156cd14..2977673 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -228,6 +228,7 @@ OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o \ rtpdec_asf.o \ rtpdec_h263.o \ rtpdec_h264.o \ + rtpdec_mpeg4.o \ rtpdec_xiph.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 0d2df59..0b316e3 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -34,6 +34,7 @@ #include "rtpdec_asf.h" #include "rtpdec_h263.h" #include "rtpdec_h264.h" +#include "rtpdec_mpeg4.h" #include "rtpdec_xiph.h" //#define DEBUG @@ -50,9 +51,6 @@ /* statistics functions */ RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; -static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4}; -static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC}; - void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) { handler->next= RTPFirstDynamicPayloadHandler; @@ -61,8 +59,8 @@ void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) void av_register_rtp_dynamic_payload_handlers(void) { - ff_register_dynamic_payload_handler(&mp4v_es_handler); - ff_register_dynamic_payload_handler(&mpeg4_generic_handler); + ff_register_dynamic_payload_handler(&ff_mp4v_es_dynamic_handler); + ff_register_dynamic_payload_handler(&ff_mpeg4_generic_dynamic_handler); ff_register_dynamic_payload_handler(&ff_amr_nb_dynamic_handler); ff_register_dynamic_payload_handler(&ff_amr_wb_dynamic_handler); ff_register_dynamic_payload_handler(&ff_h263_1998_dynamic_handler); diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c new file mode 100644 index 0000000..a765f3a --- /dev/null +++ b/libavformat/rtpdec_mpeg4.c @@ -0,0 +1,125 @@ +/** + * Common code for the RTP depacketization of MPEG-4 formats. + * Copyright (c) 2010 Fabrice Bellard + * Romain Degez + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * @brief MPEG4 / RTP Code + * @author Fabrice Bellard + * @author Romain Degez + */ + +#include "rtpdec_mpeg4.h" +#include "internal.h" +#include "libavutil/avstring.h" + +/* return the length and optionally the data */ +static int hex_to_data(uint8_t *data, const char *p) +{ + int c, len, v; + + len = 0; + v = 1; + for (;;) { + p += strspn(p, SPACE_CHARS); + if (*p == '\0') + break; + c = toupper((unsigned char) *p++); + if (c >= '0' && c <= '9') + c = c - '0'; + else if (c >= 'A' && c <= 'F') + c = c - 'A' + 10; + else + break; + v = (v << 4) | c; + if (v & 0x100) { + if (data) + data[len] = v; + len++; + v = 1; + } + } + return len; +} + +static int parse_fmtp_config(AVCodecContext * codec, char *value) +{ + /* decode the hexa encoded parameter */ + int len = hex_to_data(NULL, value); + if (codec->extradata) + av_free(codec->extradata); + codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); + if (!codec->extradata) + return AVERROR(ENOMEM); + codec->extradata_size = len; + hex_to_data(codec->extradata, value); + return 0; +} + +static int parse_sdp_line(AVFormatContext *s, int st_index, + PayloadContext *data, const char *line) +{ + const char *p; + char value[4096], attr[25]; + int res = 0; + AVCodecContext* codec = s->streams[st_index]->codec; + + if (av_strstart(line, "fmtp:", &p)) { + // remove protocol identifier + while (*p && *p == ' ') p++; // strip spaces + while (*p && *p != ' ') p++; // eat protocol identifier + while (*p && *p == ' ') p++; // strip trailing spaces + + while (ff_rtsp_next_attr_and_value(&p, + attr, sizeof(attr), + value, sizeof(value))) { + if (!strcmp(attr, "config")) { + res = parse_fmtp_config(codec, value); + + if (res < 0) + return res; + } + } + } + + return 0; + +} + +RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = { + .enc_name = "MP4V-ES", + .codec_type = AVMEDIA_TYPE_VIDEO, + .codec_id = CODEC_ID_MPEG4, + .parse_sdp_a_line = parse_sdp_line, + .open = NULL, + .close = NULL, + .parse_packet = NULL +}; + +RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = { + .enc_name = "mpeg4-generic", + .codec_type = AVMEDIA_TYPE_AUDIO, + .codec_id = CODEC_ID_AAC, + .parse_sdp_a_line = parse_sdp_line, + .open = NULL, + .close = NULL, + .parse_packet = NULL +}; diff --git a/libavformat/rtpdec_mpeg4.h b/libavformat/rtpdec_mpeg4.h new file mode 100644 index 0000000..17eabbf --- /dev/null +++ b/libavformat/rtpdec_mpeg4.h @@ -0,0 +1,39 @@ +/** + * Common code for the RTP depacketization of MPEG-4 formats. + * Copyright (c) 2010 Fabrice Bellard + * Romain Degez + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_RTPDEC_MPEG4_H +#define AVFORMAT_RTPDEC_MPEG4_H + +#include "rtpdec.h" + +/** + * MPEG-4 Video RTP callbacks. + */ +extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler; + +/** + * AAC RTP callbacks. (RFC 3640) + */ +extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler; + +#endif /* AVFORMAT_RTPDEC_MPEG4_H */ + diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index f29d727..11a9d53 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -158,59 +158,6 @@ static int sdp_parse_rtpmap(AVFormatContext *s, return 0; } -/* return the length and optionally the data */ -static int hex_to_data(uint8_t *data, const char *p) -{ - int c, len, v; - - len = 0; - v = 1; - for (;;) { - p += strspn(p, SPACE_CHARS); - if (*p == '\0') - break; - c = toupper((unsigned char) *p++); - if (c >= '0' && c <= '9') - c = c - '0'; - else if (c >= 'A' && c <= 'F') - c = c - 'A' + 10; - else - break; - v = (v << 4) | c; - if (v & 0x100) { - if (data) - data[len] = v; - len++; - v = 1; - } - } - return len; -} - -static void sdp_parse_fmtp_config(AVCodecContext * codec, void *ctx, - char *attr, char *value) -{ - switch (codec->codec_id) { - case CODEC_ID_MPEG4: - case CODEC_ID_AAC: - if (!strcmp(attr, "config")) { - /* decode the hexa encoded parameter */ - int len = hex_to_data(NULL, value); - if (codec->extradata) - av_free(codec->extradata); - codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); - if (!codec->extradata) - return; - codec->extradata_size = len; - hex_to_data(codec->extradata, value); - } - break; - default: - break; - } - return; -} - typedef struct { const char *str; uint16_t type; @@ -263,16 +210,11 @@ static void sdp_parse_fmtp(AVStream *st, const char *p) char value[4096]; int i; RTSPStream *rtsp_st = st->priv_data; - AVCodecContext *codec = st->codec; RTPPayloadData *rtp_payload_data = &rtsp_st->rtp_payload_data; /* loop on each attribute */ while (ff_rtsp_next_attr_and_value(&p, attr, sizeof(attr), value, sizeof(value))) { - /* grab the codec extra_data from the config parameter of the fmtp - * line */ - sdp_parse_fmtp_config(codec, rtsp_st->dynamic_protocol_context, - attr, value); /* Looking for a known attribute */ for (i = 0; attr_names[i].str; ++i) { if (!strcasecmp(attr, attr_names[i].str)) { -- 1.7.0.4
_______________________________________________ FFmpeg-soc mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
