frodovdr/vdr-plugin-softhddevice
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

Allow build without VDPAU.

Browse Source
This commit is contained in:
Johns 2011-12-26 14:25:42 +01:00
parent a5c28b9fe2
commit 7fbfe0396e
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
codec.c
View File

@ -120,6 +120,7 @@ static int Codec_get_buffer(AVCodecContext * video_ctx, AVFrame * frame)
fmts[1] = PIX_FMT_NONE; fmts[1] = PIX_FMT_NONE;
Codec_get_format(video_ctx, fmts); Codec_get_format(video_ctx, fmts);
} }
#ifdef USE_VDPAU
// VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4 // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
&& video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1) && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
@ -151,6 +152,7 @@ static int Codec_get_buffer(AVCodecContext * video_ctx, AVFrame * frame)
} }
return 0; return 0;
} }
#endif
// VA-API: // VA-API:
if (video_ctx->hwaccel_context) { if (video_ctx->hwaccel_context) {
unsigned surface; unsigned surface;
@ -188,6 +190,7 @@ static int Codec_get_buffer(AVCodecContext * video_ctx, AVFrame * frame)
*/ */
static void Codec_release_buffer(AVCodecContext * video_ctx, AVFrame * frame) static void Codec_release_buffer(AVCodecContext * video_ctx, AVFrame * frame)
{ {
#ifdef USE_VDPAU
// VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4 // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
&& video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1) && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
@ -209,6 +212,7 @@ static void Codec_release_buffer(AVCodecContext * video_ctx, AVFrame * frame)
return; return;
} }
#endif
// VA-API // VA-API
if (video_ctx->hwaccel_context) { if (video_ctx->hwaccel_context) {
VideoDecoder *decoder; VideoDecoder *decoder;
@ -252,6 +256,7 @@ static void Codec_draw_horiz_band(AVCodecContext * video_ctx,
int type, __attribute__ ((unused)) int type, __attribute__ ((unused))
int height) int height)
{ {
#ifdef USE_VDPAU
// VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4 // VDPAU: PIX_FMT_VDPAU_H264 .. PIX_FMT_VDPAU_VC1 PIX_FMT_VDPAU_MPEG4
if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt if ((PIX_FMT_VDPAU_H264 <= video_ctx->pix_fmt
&& video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1) && video_ctx->pix_fmt <= PIX_FMT_VDPAU_VC1)
@ -269,8 +274,12 @@ static void Codec_draw_horiz_band(AVCodecContext * video_ctx,
//Debug(3, "codec: %d references\n", vrs->info.h264.num_ref_frames); //Debug(3, "codec: %d references\n", vrs->info.h264.num_ref_frames);
VideoDrawRenderState(decoder->HwDecoder, vrs); VideoDrawRenderState(decoder->HwDecoder, vrs);
}
return; return;
}
#else
(void)video_ctx;
(void)frame;
#endif
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -547,8 +556,8 @@ struct _audio_decoder_
/// audio parser to support wired dvb streaks /// audio parser to support wired dvb streaks
AVCodecParserContext *AudioParser; AVCodecParserContext *AudioParser;
int SampleRate; ///< current sample rate int SampleRate; ///< current stream sample rate
int Channels; ///< current channels int Channels; ///< current stream channels
int HwSampleRate; ///< hw sample rate int HwSampleRate; ///< hw sample rate
int HwChannels; ///< hw channels int HwChannels; ///< hw channels
@ -661,11 +670,8 @@ void CodecAudioDecode(AudioDecoder * audio_decoder, AVPacket * avpkt)
AVCodecContext *audio_ctx; AVCodecContext *audio_ctx;
int index; int index;
if (!audio_decoder->AudioParser) { //#define spkt avpkt
Fatal(_("codec: internal error parser freeded while running\n")); #if 1 // didn't fix crash in av_parser_parse2
}
#define spkt avpkt
#if 0 // didn't fix crash in av_parser_parse2
AVPacket spkt[1]; AVPacket spkt[1];
// av_new_packet reserves FF_INPUT_BUFFER_PADDING_SIZE and clears it // av_new_packet reserves FF_INPUT_BUFFER_PADDING_SIZE and clears it
@ -677,6 +683,9 @@ void CodecAudioDecode(AudioDecoder * audio_decoder, AVPacket * avpkt)
spkt->pts = avpkt->pts; spkt->pts = avpkt->pts;
spkt->dts = avpkt->dts; spkt->dts = avpkt->dts;
#endif #endif
if (!audio_decoder->AudioParser) {
Fatal(_("codec: internal error parser freeded while running\n"));
}
audio_ctx = audio_decoder->AudioCtx; audio_ctx = audio_decoder->AudioCtx;
index = 0; index = 0;
@ -774,7 +783,7 @@ void CodecAudioDecode(AudioDecoder * audio_decoder, AVPacket * avpkt)
index += n; index += n;
} }
#if 0 #if 1
av_destruct_packet(spkt); av_destruct_packet(spkt);
#endif #endif
} }