[FFmpeg-cvslog] r22768 - in trunk/libavformat: Makefile rtpdec_vorbis.c rtpdec_vorbis.h rtpdec_xiph.c rtpdec_xiph.h rtsp.c

[rbultje]

Author: rbultje
Date: Thu Apr  1 23:43:22 2010
New Revision: 22768

Log:
Merge Vorbis / Theora depayloaders.

Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>.

Deleted:
   trunk/libavformat/rtpdec_vorbis.c
   trunk/libavformat/rtpdec_vorbis.h
Modified:
   trunk/libavformat/Makefile
   trunk/libavformat/rtpdec_xiph.c
   trunk/libavformat/rtpdec_xiph.h
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	Thu Apr  1 23:42:10 2010	(r22767)
+++ trunk/libavformat/Makefile	Thu Apr  1 23:43:22 2010	(r22768)
@@ -225,7 +225,6 @@ OBJS-$(CONFIG_SDP_DEMUXER)              
                                             rtpdec_asf.o  \
                                             rtpdec_h263.o \
                                             rtpdec_h264.o \
-                                            rtpdec_vorbis.o \
                                             rtpdec_xiph.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o id3v2.o

Modified: trunk/libavformat/rtpdec_xiph.c
==============================================================================
--- trunk/libavformat/rtpdec_xiph.c	Thu Apr  1 23:42:10 2010	(r22767)
+++ trunk/libavformat/rtpdec_xiph.c	Thu Apr  1 23:43:22 2010	(r22768)
@@ -1,5 +1,6 @@
 /*
  * Xiph RTP Protocols
+ * Copyright (c) 2009 Colin McQuillian
  * Copyright (c) 2010 Josh Allmann
  *
  * This file is part of FFmpeg.
@@ -22,6 +23,7 @@
 /**
  * @file libavformat/rtpdec_xiph.c
  * @brief Xiph / RTP Code
+ * @author Colin McQuillan <m.niloc at gmail.com>
  * @author Josh Allmann <joshua.allmann at gmail.com>
  */
 
@@ -385,3 +387,13 @@ RTPDynamicProtocolHandler ff_theora_dyna
     .close            = xiph_free_context,
     .parse_packet     = xiph_handle_packet
 };
+
+RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = {
+    .enc_name         = "vorbis",
+    .codec_type       = CODEC_TYPE_AUDIO,
+    .codec_id         = CODEC_ID_VORBIS,
+    .parse_sdp_a_line = xiph_parse_sdp_line,
+    .open             = xiph_new_context,
+    .close            = xiph_free_context,
+    .parse_packet     = xiph_handle_packet
+};

Modified: trunk/libavformat/rtpdec_xiph.h
==============================================================================
--- trunk/libavformat/rtpdec_xiph.h	Thu Apr  1 23:42:10 2010	(r22767)
+++ trunk/libavformat/rtpdec_xiph.h	Thu Apr  1 23:43:22 2010	(r22768)
@@ -1,6 +1,7 @@
 /*
  * 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.
@@ -31,4 +32,9 @@
  */
 extern RTPDynamicProtocolHandler ff_theora_dynamic_handler;
 
+/**
+ * Vorbis RTP callbacks.
+ */
+extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler;
+
 #endif /* AVFORMAT_RTPDEC_XIPH_H */

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Thu Apr  1 23:42:10 2010	(r22767)
+++ trunk/libavformat/rtsp.c	Thu Apr  1 23:43:22 2010	(r22768)
@@ -37,7 +37,6 @@
 #include "rtpdec.h"
 #include "rdt.h"
 #include "rtpdec_asf.h"
-#include "rtpdec_vorbis.h"
 
 //#define DEBUG
 //#define DEBUG_RTP_TCP
@@ -217,9 +216,6 @@ static void sdp_parse_fmtp_config(AVCode
             hex_to_data(codec->extradata, value);
         }
         break;
-    case CODEC_ID_VORBIS:
-        ff_vorbis_parse_fmtp_config(codec, ctx, attr, value);
-        break;
     default:
         break;
     }