Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Handle alternating video streams a lot better.

Browse source
This commit is contained in:
Unknown W. Brackets 2014-01-21 01:16:16 -08:00
parent b15ead5b5c
commit f19d8d2eae
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Core/HW/MediaEngine.cpp
View file

@ -128,7 +128,7 @@ void __AdjustBGMVolume(s16 *samples, u32 count) {
MediaEngine::MediaEngine(): m_pdata(0) { MediaEngine::MediaEngine(): m_pdata(0) {
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
m_pFormatCtx = 0; m_pFormatCtx = 0;
m_pCodecCtx = 0; m_pCodecCtxs.clear();
m_pFrame = 0; m_pFrame = 0;
m_pFrameRGB = 0; m_pFrameRGB = 0;
m_pIOContext = 0; m_pIOContext = 0;
@ -292,14 +292,14 @@ void MediaEngine::closeContext()
av_free(m_pIOContext->buffer); av_free(m_pIOContext->buffer);
if (m_pIOContext) if (m_pIOContext)
av_free(m_pIOContext); av_free(m_pIOContext);
if (m_pCodecCtx) for (auto it = m_pCodecCtxs.begin(), end = m_pCodecCtxs.end(); it != end; ++it)
avcodec_close(m_pCodecCtx); avcodec_close(it->second);
if (m_pFormatCtx) if (m_pFormatCtx)
avformat_close_input(&m_pFormatCtx); avformat_close_input(&m_pFormatCtx);
m_pFrame = 0; m_pFrame = 0;
m_pFrameRGB = 0; m_pFrameRGB = 0;
m_pIOContext = 0; m_pIOContext = 0;
m_pCodecCtx = 0; m_pCodecCtxs.clear();
m_pFormatCtx = 0; m_pFormatCtx = 0;
#endif #endif
m_buffer = 0; m_buffer = 0;
@ -356,13 +356,9 @@ bool MediaEngine::setVideoStream(int streamNum, bool force) {
m_videoStream = streamNum; m_videoStream = streamNum;
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
if (m_pFormatCtx) { if (m_pFormatCtx && m_pCodecCtxs.find(m_videoStream) == m_pCodecCtxs.end()) {
if (m_pCodecCtx) {
avcodec_close(m_pCodecCtx);
}
// Get a pointer to the codec context for the video stream // Get a pointer to the codec context for the video stream
m_pCodecCtx = m_pFormatCtx->streams[m_videoStream]->codec; AVCodecContext *m_pCodecCtx = m_pFormatCtx->streams[m_videoStream]->codec;
// Find the decoder for the video stream // Find the decoder for the video stream
AVCodec *pCodec = avcodec_find_decoder(m_pCodecCtx->codec_id); AVCodec *pCodec = avcodec_find_decoder(m_pCodecCtx->codec_id);
@ -375,6 +371,7 @@ bool MediaEngine::setVideoStream(int streamNum, bool force) {
if (avcodec_open2(m_pCodecCtx, pCodec, &optionsDict) < 0) { if (avcodec_open2(m_pCodecCtx, pCodec, &optionsDict) < 0) {
return false; // Could not open codec return false; // Could not open codec
} }
m_pCodecCtxs[m_videoStream] = m_pCodecCtx;
} }
#endif #endif
@ -384,8 +381,11 @@ bool MediaEngine::setVideoStream(int streamNum, bool force) {
bool MediaEngine::setVideoDim(int width, int height) bool MediaEngine::setVideoDim(int width, int height)
{ {
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
if (!m_pCodecCtx) auto codecIter = m_pCodecCtxs.find(m_videoStream);
if (codecIter == m_pCodecCtxs.end())
return false; return false;
AVCodecContext *m_pCodecCtx = codecIter->second;
if (width == 0 && height == 0) if (width == 0 && height == 0)
{ {
// use the orignal video size // use the orignal video size
@ -418,6 +418,9 @@ bool MediaEngine::setVideoDim(int width, int height)
void MediaEngine::updateSwsFormat(int videoPixelMode) { void MediaEngine::updateSwsFormat(int videoPixelMode) {
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
auto codecIter = m_pCodecCtxs.find(m_videoStream);
AVCodecContext *m_pCodecCtx = codecIter == m_pCodecCtxs.end() ? 0 : codecIter->second;
AVPixelFormat swsDesired = getSwsFormat(videoPixelMode); AVPixelFormat swsDesired = getSwsFormat(videoPixelMode);
if (swsDesired != m_sws_fmt && m_pCodecCtx != 0) { if (swsDesired != m_sws_fmt && m_pCodecCtx != 0) {
m_sws_fmt = swsDesired; m_sws_fmt = swsDesired;
@ -443,6 +446,9 @@ bool MediaEngine::stepVideo(int videoPixelMode) {
// if video engine is broken, force to add timestamp // if video engine is broken, force to add timestamp
m_videopts += 3003; m_videopts += 3003;
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
auto codecIter = m_pCodecCtxs.find(m_videoStream);
AVCodecContext *m_pCodecCtx = codecIter == m_pCodecCtxs.end() ? 0 : codecIter->second;
if (!m_pFormatCtx) if (!m_pFormatCtx)
return false; return false;
if (!m_pCodecCtx) if (!m_pCodecCtx)

3
Core/HW/MediaEngine.h
View file

@ -24,6 +24,7 @@
// An approximation of what the interface will look like. Similar to JPCSP's. // An approximation of what the interface will look like. Similar to JPCSP's.
#include <map>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Core/HLE/sceMpeg.h" #include "Core/HLE/sceMpeg.h"
@ -96,7 +97,7 @@ public: // TODO: Very little of this below should be public.
// Video ffmpeg context - not used for audio // Video ffmpeg context - not used for audio
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
AVFormatContext *m_pFormatCtx; AVFormatContext *m_pFormatCtx;
AVCodecContext *m_pCodecCtx; std::map<int, AVCodecContext *> m_pCodecCtxs;
AVFrame *m_pFrame; AVFrame *m_pFrame;
AVFrame *m_pFrameRGB; AVFrame *m_pFrameRGB;
AVIOContext *m_pIOContext; AVIOContext *m_pIOContext;