avc: avcsrc is always enabled

This commit is contained in:
Quentin Smith 2011-04-19 15:04:05 -04:00 committed by David Schleef
parent 708e96bef4
commit 38681bf1e0

View file

@ -37,11 +37,8 @@
#include "config.h" #include "config.h"
#endif #endif
//#define ENABLE
#ifdef ENABLE
#include <AVCVideoServices/AVCVideoServices.h> #include <AVCVideoServices/AVCVideoServices.h>
using namespace AVS; using namespace AVS;
#endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbasesrc.h> #include <gst/base/gstbasesrc.h>
@ -209,7 +206,6 @@ gst_avc_src_get_caps (GstBaseSrc * src)
#define kNumCyclesInMPEGReceiverSegment 200 #define kNumCyclesInMPEGReceiverSegment 200
#define kNumSegmentsInMPEGReceiverProgram 10 #define kNumSegmentsInMPEGReceiverProgram 10
#ifdef ENABLE
void void
MPEGReceiverMessageReceivedProc (UInt32 msg, UInt32 param1, UInt32 param2, MPEGReceiverMessageReceivedProc (UInt32 msg, UInt32 param1, UInt32 param2,
void *pRefCon) void *pRefCon)
@ -256,7 +252,6 @@ MyStructuredDataPushProc (UInt32 CycleDataCount,
return 0; return 0;
} }
#endif
static gboolean static gboolean
gst_avc_src_start (GstBaseSrc * src) gst_avc_src_start (GstBaseSrc * src)
@ -267,7 +262,6 @@ gst_avc_src_start (GstBaseSrc * src)
avcsrc->unlock = FALSE; avcsrc->unlock = FALSE;
#ifdef ENABLE
// Create a AVCDeviceController // Create a AVCDeviceController
if (!avcsrc->pAVCDeviceController) if (!avcsrc->pAVCDeviceController)
CreateAVCDeviceController (&avcsrc->pAVCDeviceController); CreateAVCDeviceController (&avcsrc->pAVCDeviceController);
@ -308,7 +302,6 @@ gst_avc_src_start (GstBaseSrc * src)
kNumCyclesInMPEGReceiverSegment, (void *) avcsrc); kNumCyclesInMPEGReceiverSegment, (void *) avcsrc);
avcsrc->pAVCDevice->StartAVCDeviceStream (avcsrc->pAVCDeviceStream); avcsrc->pAVCDevice->StartAVCDeviceStream (avcsrc->pAVCDeviceStream);
#endif
return TRUE; return TRUE;
} }