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

Cut down on void *'s for easier debugging.

Browse source 
Nice to be able to see inside structs with the debugger.
This commit is contained in:
Unknown W. Brackets 2013-06-08 00:22:59 -07:00
parent 36eb90293e
commit 073282217c
2 changed files with 22 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Core/HW/MediaEngine.cpp
View file

@ -114,9 +114,9 @@ void MediaEngine::closeMedia() {
if (m_pIOContext) if (m_pIOContext)
av_free(m_pIOContext); av_free(m_pIOContext);
if (m_pCodecCtx) if (m_pCodecCtx)
avcodec_close((AVCodecContext*)m_pCodecCtx); avcodec_close(m_pCodecCtx);
if (m_pFormatCtx) if (m_pFormatCtx)
avformat_close_input((AVFormatContext**)&m_pFormatCtx); avformat_close_input(&m_pFormatCtx);
#endif // USE_FFMPEG #endif // USE_FFMPEG
if (m_pdata) if (m_pdata)
delete [] m_pdata; delete [] m_pdata;
@ -181,21 +181,20 @@ bool MediaEngine::openContext() {
u8* tempbuf = (u8*)av_malloc(m_bufSize); u8* tempbuf = (u8*)av_malloc(m_bufSize);
AVFormatContext *pFormatCtx = avformat_alloc_context(); m_pFormatCtx = avformat_alloc_context();
m_pFormatCtx = (void*)pFormatCtx;
m_pIOContext = avio_alloc_context(tempbuf, m_bufSize, 0, (void*)this, _MpegReadbuffer, NULL, _MpegSeekbuffer); m_pIOContext = avio_alloc_context(tempbuf, m_bufSize, 0, (void*)this, _MpegReadbuffer, NULL, _MpegSeekbuffer);
pFormatCtx->pb = m_pIOContext; m_pFormatCtx->pb = m_pIOContext;
// Open video file // Open video file
if(avformat_open_input((AVFormatContext**)&m_pFormatCtx, NULL, NULL, NULL) != 0) if(avformat_open_input((AVFormatContext**)&m_pFormatCtx, NULL, NULL, NULL) != 0)
return false; return false;
if(avformat_find_stream_info(pFormatCtx, NULL) < 0) if(avformat_find_stream_info(m_pFormatCtx, NULL) < 0)
return false; return false;
// Find the first video stream // Find the first video stream
for(int i = 0; i < (int)pFormatCtx->nb_streams; i++) { for(int i = 0; i < (int)m_pFormatCtx->nb_streams; i++) {
if(pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) { if(m_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
m_videoStream = i; m_videoStream = i;
break; break;
} }
@ -204,17 +203,16 @@ bool MediaEngine::openContext() {
return false; return false;
// Get a pointer to the codec context for the video stream // Get a pointer to the codec context for the video stream
m_pCodecCtx = (void*)pFormatCtx->streams[m_videoStream]->codec; m_pCodecCtx = m_pFormatCtx->streams[m_videoStream]->codec;
AVCodecContext *pCodecCtx = (AVCodecContext*)m_pCodecCtx;
// Find the decoder for the video stream // Find the decoder for the video stream
AVCodec *pCodec = avcodec_find_decoder(pCodecCtx->codec_id); AVCodec *pCodec = avcodec_find_decoder(m_pCodecCtx->codec_id);
if(pCodec == NULL) if(pCodec == NULL)
return false; return false;
// Open codec // Open codec
AVDictionary *optionsDict = 0; AVDictionary *optionsDict = 0;
if(avcodec_open2(pCodecCtx, pCodec, &optionsDict)<0) if(avcodec_open2(m_pCodecCtx, pCodec, &optionsDict)<0)
return false; // Could not open codec return false; // Could not open codec
setVideoDim(); setVideoDim();
@ -300,12 +298,11 @@ bool MediaEngine::setVideoDim(int width, int height)
if (!m_pCodecCtx) if (!m_pCodecCtx)
return false; return false;
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
AVCodecContext *pCodecCtx = (AVCodecContext*)m_pCodecCtx;
if (width == 0 && height == 0) if (width == 0 && height == 0)
{ {
// use the orignal video size // use the orignal video size
m_desWidth = pCodecCtx->width; m_desWidth = m_pCodecCtx->width;
m_desHeight = pCodecCtx->height; m_desHeight = m_pCodecCtx->height;
} }
else else
{ {
@ -333,16 +330,15 @@ bool MediaEngine::setVideoDim(int width, int height)
void MediaEngine::updateSwsFormat(int videoPixelMode) { void MediaEngine::updateSwsFormat(int videoPixelMode) {
#ifdef USE_FFMPEG #ifdef USE_FFMPEG
AVCodecContext *pCodecCtx = (AVCodecContext*)m_pCodecCtx;
AVPixelFormat swsDesired = getSwsFormat(videoPixelMode); AVPixelFormat swsDesired = getSwsFormat(videoPixelMode);
if (swsDesired != m_sws_fmt) { if (swsDesired != m_sws_fmt) {
m_sws_fmt = swsDesired; m_sws_fmt = swsDesired;
m_sws_ctx = sws_getCachedContext m_sws_ctx = sws_getCachedContext
( (
m_sws_ctx, m_sws_ctx,
pCodecCtx->width, m_pCodecCtx->width,
pCodecCtx->height, m_pCodecCtx->height,
pCodecCtx->pix_fmt, m_pCodecCtx->pix_fmt,
m_desWidth, m_desWidth,
m_desHeight, m_desHeight,
(AVPixelFormat)m_sws_fmt, (AVPixelFormat)m_sws_fmt,
@ -365,15 +361,13 @@ bool MediaEngine::stepVideo(int videoPixelMode) {
// Update the linesize for the new format too. We started with the largest size, so it should fit. // Update the linesize for the new format too. We started with the largest size, so it should fit.
m_pFrameRGB->linesize[0] = getPixelFormatBytes(videoPixelMode) * m_desWidth; m_pFrameRGB->linesize[0] = getPixelFormatBytes(videoPixelMode) * m_desWidth;
AVFormatContext *pFormatCtx = (AVFormatContext*)m_pFormatCtx;
AVCodecContext *pCodecCtx = (AVCodecContext*)m_pCodecCtx;
if ((!m_pFrame)||(!m_pFrameRGB)) if ((!m_pFrame)||(!m_pFrameRGB))
return false; return false;
AVPacket packet; AVPacket packet;
int frameFinished; int frameFinished;
bool bGetFrame = false; bool bGetFrame = false;
while (!bGetFrame) { while (!bGetFrame) {
bool dataEnd = av_read_frame(pFormatCtx, &packet) < 0; bool dataEnd = av_read_frame(m_pFormatCtx, &packet) < 0;
// Even if we've read all frames, some may have been re-ordered frames at the end. // Even if we've read all frames, some may have been re-ordered frames at the end.
// Still need to decode those, so keep calling avcodec_decode_video2(). // Still need to decode those, so keep calling avcodec_decode_video2().
@ -382,10 +376,10 @@ bool MediaEngine::stepVideo(int videoPixelMode) {
if (dataEnd) if (dataEnd)
av_free_packet(&packet); av_free_packet(&packet);
int result = avcodec_decode_video2(pCodecCtx, m_pFrame, &frameFinished, &packet); int result = avcodec_decode_video2(m_pCodecCtx, m_pFrame, &frameFinished, &packet);
if (frameFinished) { if (frameFinished) {
sws_scale(m_sws_ctx, m_pFrame->data, m_pFrame->linesize, 0, sws_scale(m_sws_ctx, m_pFrame->data, m_pFrame->linesize, 0,
pCodecCtx->height, m_pFrameRGB->data, m_pFrameRGB->linesize); m_pCodecCtx->height, m_pFrameRGB->data, m_pFrameRGB->linesize);
int firstTimeStamp = bswap32(*(int*)(m_pdata + 86)); int firstTimeStamp = bswap32(*(int*)(m_pdata + 86));
m_videopts = m_pFrame->pkt_dts + av_frame_get_pkt_duration(m_pFrame) - firstTimeStamp; m_videopts = m_pFrame->pkt_dts + av_frame_get_pkt_duration(m_pFrame) - firstTimeStamp;

6
Core/HW/MediaEngine.h
View file

@ -33,6 +33,8 @@
struct SwsContext; struct SwsContext;
struct AVFrame; struct AVFrame;
struct AVIOContext; struct AVIOContext;
struct AVFormatContext;
struct AVCodecContext;
class MediaEngine class MediaEngine
{ {
@ -73,8 +75,8 @@ private:
public: public:
void *m_pFormatCtx; AVFormatContext *m_pFormatCtx;
void *m_pCodecCtx; AVCodecContext *m_pCodecCtx;
AVFrame *m_pFrame; AVFrame *m_pFrame;
AVFrame *m_pFrameRGB; AVFrame *m_pFrameRGB;
AVIOContext *m_pIOContext; AVIOContext *m_pIOContext;