Permalink
Browse files

More XvMC code removal.

  • Loading branch information...
Mark Kendall
Mark Kendall committed Dec 6, 2010
1 parent 252f801 commit 5e5908b4d6ca88ecf4892e0e853e6b2a78a0546e
@@ -4018,54 +4018,6 @@ bool AvFormatDecoder::GetFrame(DecodeType decodetype)
continue;
}
- if (ringBuffer->IsDVD() &&
- curstream->codec->codec_type == CODEC_TYPE_VIDEO)
- {
-#ifdef USING_XVMC
- if (!private_dec)
- {
- int current_width = curstream->codec->width;
- int video_width = m_parent->GetVideoSize().width();
- if (dvd_xvmc_enabled && m_parent && m_parent->getVideoOutput())
- {
- bool dvd_xvmc_active = false;
- if (codec_is_xvmc(video_codec_id))
- {
- dvd_xvmc_active = true;
- }
-
- bool indiscmenu = ringBuffer->IsInDiscMenuOrStillFrame();
- if ((indiscmenu && dvd_xvmc_active) ||
- ((!indiscmenu && !dvd_xvmc_active)))
- {
- VERBOSE(VB_PLAYBACK, LOC + QString("DVD Codec Change "
- "indiscmenu %1 dvd_xvmc_active %2")
- .arg(indiscmenu).arg(dvd_xvmc_active));
- dvd_video_codec_changed = true;
- }
- }
-
- if ((video_width > 0) && dvd_video_codec_changed)
- {
- VERBOSE(VB_PLAYBACK, LOC +
- QString("DVD Stream/Codec Change "
- "video_width %1 current_width %2 "
- "dvd_video_codec_changed %3")
- .arg(video_width).arg(current_width)
- .arg(dvd_video_codec_changed));
- av_free_packet(pkt);
- if (current_width > 0) {
- CloseCodecs();
- ScanStreams(false);
- allowedquit = true;
- dvd_video_codec_changed = false;
- }
- continue;
- }
- }
-#endif //USING_XVMC
- }
-
enum CodecType codec_type = curstream->codec->codec_type;
if (storevideoframes && codec_type == CODEC_TYPE_VIDEO)
@@ -14,9 +14,6 @@ typedef enum FrameType_
FMT_NONE = -1,
FMT_RGB24 = 0,
FMT_YV12,
- FMT_XVMC_IDCT_MPEG2,
- FMT_XVMC_MOCO_MPEG2,
- FMT_VIA_HWSLICE,
FMT_IA44,
FMT_AI44,
FMT_ARGB32,
@@ -5090,7 +5090,6 @@ bool TV::CreatePIP(PlayerContext *ctx, const ProgramInfo *info)
return false;
}
- /* TODO implement PIP solution for Xvmc playback */
if (!IsPIPSupported(mctx))
{
VERBOSE(VB_IMPORTANT, LOC + "PiP not supported by video method.");
Oops, something went wrong.

0 comments on commit 5e5908b

Please sign in to comment.