MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove mostly unnecessary rtpdec_*.h files, store the declarations in one file

Browse Source 
Originally committed as revision 24596 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-07-30 12:04:27 +00:00
parent d6bb31a46b
commit 965a3ddb1f
19 changed files with 58 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/rtpdec.c
View File

@ -30,14 +30,7 @@
#include "network.h"
#include "rtpdec.h"
#include "rtpdec_amr.h"
#include "rtpdec_asf.h"
#include "rtpdec_h263.h"
#include "rtpdec_h264.h"
#include "rtpdec_mpeg4.h"
#include "rtpdec_qdm2.h"
#include "rtpdec_svq3.h"
#include "rtpdec_xiph.h"
#include "rtpdec_formats.h"
//#define DEBUG

2
libavformat/rtpdec_amr.c
View File

@ -20,7 +20,7 @@
*/
#include "avformat.h"
#include "rtpdec_amr.h"
#include "rtpdec_formats.h"
#include "libavutil/avstring.h"
static const uint8_t frame_sizes_nb[16] = {

30
libavformat/rtpdec_amr.h
View File

@ -1,30 +0,0 @@
/*
* RTP AMR Depacketizer, RFC 3267
* Copyright (c) 2010 Martin Storsjo
*
* 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_AMR_H
#define AVFORMAT_RTPDEC_AMR_H
#include "rtpdec.h"
extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler;
extern RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler;
#endif /* AVFORMAT_RTPDEC_AMR_H */

2
libavformat/rtpdec_asf.c
View File

@ -29,7 +29,7 @@
#include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h"
#include "rtp.h"
#include "rtpdec_asf.h"
#include "rtpdec_formats.h"
#include "rtsp.h"
#include "asf.h"

42
libavformat/rtpdec_asf.h
View File

@ -1,42 +0,0 @@
/*
* Microsoft RTP/ASF support.
* Copyright (c) 2008 Ronald S. Bultje
*
* 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_ASF_H
#define AVFORMAT_RTPDEC_ASF_H
#include "avformat.h"
#include "rtpdec.h"
/**
* Parse a Windows Media Server-specific SDP line
*
* @param s RTSP demux context
*/
int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p);
/**
* Handlers for the x-asf-pf payloads (the payload ID for RTP/ASF).
* Defined and implemented in rtp_asf.c, registered in rtpdec.c.
*/
extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler,
ff_ms_rtp_asf_pfa_handler;
#endif /* AVFORMAT_RTPDEC_ASF_H */

48
libavformat/rtpdec_formats.h Normal file
View File

@ -0,0 +1,48 @@
/*
* RTP depacketizer declarations
* Copyright (c) 2010 Martin Storsjo
*
* 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_FORMATS_H
#define AVFORMAT_RTPDEC_FORMATS_H
#include "rtpdec.h"
/**
* Parse a Windows Media Server-specific SDP line
*
* @param s RTSP demux context
*/
int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p);
extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler;
extern RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler;
extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler;
extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfa_handler;
extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler;
extern RTPDynamicProtocolHandler ff_qdm2_dynamic_handler;
extern RTPDynamicProtocolHandler ff_svq3_dynamic_handler;
extern RTPDynamicProtocolHandler ff_theora_dynamic_handler;
extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler;
#endif /* AVFORMAT_RTPDEC_FORMATS_H */

2
libavformat/rtpdec_h263.c
View File

@ -20,7 +20,7 @@
*/
#include "avformat.h"
#include "rtpdec_h263.h"
#include "rtpdec_formats.h"
#include "libavutil/intreadwrite.h"
static int h263_handle_packet(AVFormatContext *ctx,

30
libavformat/rtpdec_h263.h
View File

@ -1,30 +0,0 @@
/*
* RTP H.263 Depacketizer, RFC 4629
* Copyright (c) 2010 Martin Storsjo
*
* 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_H263_H
#define AVFORMAT_RTPDEC_H263_H
#include "rtpdec.h"
extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler;
#endif /* AVFORMAT_RTPDEC_H263_H */

2
libavformat/rtpdec_h264.c
View File

@ -47,7 +47,7 @@
#include <assert.h>
#include "rtpdec.h"
#include "rtpdec_h264.h"
#include "rtpdec_formats.h"
/**
RTP/H264 specific private data.

29
libavformat/rtpdec_h264.h
View File

@ -1,29 +0,0 @@
/*
* RTP H264 Protocol (RFC3984)
* Copyright (c) 2006 Ryan Martell
*
* 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_H264_H
#define AVFORMAT_RTPDEC_H264_H
#include "rtpdec.h"
extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
#endif /* AVFORMAT_RTPDEC_H264_H */

2
libavformat/rtpdec_mpeg4.c
View File

@ -27,7 +27,7 @@
* @author Romain Degez
*/
#include "rtpdec_mpeg4.h"
#include "rtpdec_formats.h"
#include "internal.h"
#include "libavutil/avstring.h"
#include "libavcodec/get_bits.h"

39
libavformat/rtpdec_mpeg4.h
View File

@ -1,39 +0,0 @@
/**
* 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. (RFC 3016)
*/
extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler;
/**
* AAC RTP callbacks. (RFC 3640)
*/
extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler;
#endif /* AVFORMAT_RTPDEC_MPEG4_H */

2
libavformat/rtpdec_qdm2.c
View File

@ -30,7 +30,7 @@
#include "libavcodec/avcodec.h"
#include "rtp.h"
#include "rtpdec.h"
#include "rtpdec_qdm2.h"
#include "rtpdec_formats.h"
struct PayloadContext {
/** values read from the config header, used as packet headers */

32
libavformat/rtpdec_qdm2.h
View File

@ -1,32 +0,0 @@
/*
* QDesign Music 2 (QDM2) payload for RTP
* Copyright (c) 2010 Ronald S. Bultje
*
* 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_QDM2_H
#define AVFORMAT_RTPDEC_QDM2_H
#include "rtpdec.h"
/**
* QMD2 RTP callbacks.
*/
extern RTPDynamicProtocolHandler ff_qdm2_dynamic_handler;
#endif /* AVFORMAT_RTPDEC_QDM2_H */

2
libavformat/rtpdec_svq3.c
View File

@ -30,7 +30,7 @@
#include "libavutil/intreadwrite.h"
#include "rtp.h"
#include "rtpdec.h"
#include "rtpdec_svq3.h"
#include "rtpdec_formats.h"
struct PayloadContext {
ByteIOContext *pktbuf;

33
libavformat/rtpdec_svq3.h
View File

@ -1,33 +0,0 @@
/*
* Sorenson-3 (SVQ3/SV3V) payload for RTP
* Copyright (c) 2010 Ronald S. Bultje
*
* 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_SVQ3_H
#define AVFORMAT_RTPDEC_SVQ3_H
#include "libavcodec/avcodec.h"
#include "rtpdec.h"
/**
* Sorenson-3 RTP callbacks.
*/
extern RTPDynamicProtocolHandler ff_svq3_dynamic_handler;
#endif /* AVFORMAT_RTPDEC_SVQ3_H */

2
libavformat/rtpdec_xiph.c
View File

@ -34,7 +34,7 @@
#include <assert.h>
#include "rtpdec.h"
#include "rtpdec_xiph.h"
#include "rtpdec_formats.h"
/**
* RTP/Xiph specific private data.

40
libavformat/rtpdec_xiph.h
View File

@ -1,40 +0,0 @@
/*
* Xiph RTP Protocols
* Based off RFC 5215 (Vorbis RTP) and the Theora RTP draft.
* Copyright (c) 2009 Colin McQuillian
* Copyright (c) 2010 Josh Allmann
*
* 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_XIPH_H
#define AVFORMAT_RTPDEC_XIPH_H
#include "libavcodec/avcodec.h"
#include "rtpdec.h"
/**
* Theora RTP callbacks.
*/
extern RTPDynamicProtocolHandler ff_theora_dynamic_handler;
/**
* Vorbis RTP callbacks.
*/
extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler;
#endif /* AVFORMAT_RTPDEC_XIPH_H */

2
libavformat/rtsp.c
View File

@ -38,7 +38,7 @@
#include "rtpdec.h"
#include "rdt.h"
#include "rtpdec_asf.h"
#include "rtpdec_formats.h"
//#define DEBUG
//#define DEBUG_RTP_TCP