diff options
Diffstat (limited to 'decoder.c')
| -rw-r--r-- | decoder.c | 144 |
1 files changed, 72 insertions, 72 deletions
@@ -13,105 +13,105 @@ int cDecoder::Open() { - m_Codec = avcodec_find_decoder(CODEC_ID_MPEG2VIDEO); - if (!m_Codec) - { - printf("codec not found\n"); - return -1; - } - m_Context = avcodec_alloc_context(); - if (avcodec_open(m_Context, m_Codec) < 0) - { - printf("could not open codec\n"); - return -1; - } - m_PicDecoded = avcodec_alloc_frame(); - m_PicResample = avcodec_alloc_frame(); - m_BufferResample = new unsigned char[(400 * 300 * 3) / 2]; // size for YUV 420 - m_PicConvert = avcodec_alloc_frame(); - m_BufferConvert = new unsigned char[400 * 300 * 4]; // size for RGBA32 - - return 0; + m_Codec = avcodec_find_decoder(CODEC_ID_MPEG2VIDEO); + if (!m_Codec) + { + printf("codec not found\n"); + return -1; + } + m_Context = avcodec_alloc_context(); + if (avcodec_open(m_Context, m_Codec) < 0) + { + printf("could not open codec\n"); + return -1; + } + m_PicDecoded = avcodec_alloc_frame(); + m_PicResample = avcodec_alloc_frame(); + m_BufferResample = new unsigned char[(400 * 300 * 3) / 2]; // size for YUV 420 + m_PicConvert = avcodec_alloc_frame(); + m_BufferConvert = new unsigned char[400 * 300 * 4]; // size for RGBA32 + + return 0; } int cDecoder::Close() { - delete[] m_BufferConvert; - free(m_PicConvert); - delete[] m_BufferResample; - free(m_PicResample); - avcodec_close(m_Context); - free(m_Context); - free(m_PicDecoded); - - return 0; + delete[] m_BufferConvert; + free(m_PicConvert); + delete[] m_BufferResample; + free(m_PicResample); + avcodec_close(m_Context); + free(m_Context); + free(m_PicDecoded); + + return 0; } int cDecoder::Decode(unsigned char * data, int length) { - int gotPicture, len; - - len = avcodec_decode_video(m_Context, m_PicDecoded, &gotPicture, data, length); - if (len < 0) - { - printf("Error while decoding frame\n"); - return -1; - } - if (!gotPicture) - { - return -1; - } - - return 0; + int gotPicture, len; + + len = avcodec_decode_video(m_Context, m_PicDecoded, &gotPicture, data, length); + if (len < 0) + { + printf("Error while decoding frame\n"); + return -1; + } + if (!gotPicture) + { + return -1; + } + + return 0; } int cDecoder::Resample(int width, int height) { - ImgReSampleContext * contextResample; + ImgReSampleContext * contextResample; - m_Width = width; - m_Height = height; + m_Width = width; + m_Height = height; #if LIBAVCODEC_BUILD < 4708 - contextResample = img_resample_full_init(m_Width, m_Height, - m_Context->width, m_Context->height, - OsdPipSetup.CropTop, OsdPipSetup.CropBottom, - OsdPipSetup.CropLeft, OsdPipSetup.CropRight); + contextResample = img_resample_full_init(m_Width, m_Height, + m_Context->width, m_Context->height, + OsdPipSetup.CropTop, OsdPipSetup.CropBottom, + OsdPipSetup.CropLeft, OsdPipSetup.CropRight); #else - contextResample = img_resample_full_init(m_Width, m_Height, - m_Context->width, m_Context->height, - OsdPipSetup.CropTop, OsdPipSetup.CropBottom, - OsdPipSetup.CropLeft, OsdPipSetup.CropRight, - 0, 0, 0, 0); + contextResample = img_resample_full_init(m_Width, m_Height, + m_Context->width, m_Context->height, + OsdPipSetup.CropTop, OsdPipSetup.CropBottom, + OsdPipSetup.CropLeft, OsdPipSetup.CropRight, + 0, 0, 0, 0); #endif - if (!contextResample) { - printf("Error initializing resample context.\n"); - return -1; - } - avpicture_fill((AVPicture *) m_PicResample, m_BufferResample, - PIX_FMT_YUV420P, m_Width, m_Height); - img_resample(contextResample, (AVPicture *) m_PicResample, (AVPicture *) m_PicDecoded); - img_resample_close(contextResample); - - return 0; + if (!contextResample) { + printf("Error initializing resample context.\n"); + return -1; + } + avpicture_fill((AVPicture *) m_PicResample, m_BufferResample, + PIX_FMT_YUV420P, m_Width, m_Height); + img_resample(contextResample, (AVPicture *) m_PicResample, (AVPicture *) m_PicDecoded); + img_resample_close(contextResample); + + return 0; } int cDecoder::ConvertToRGB() { - avpicture_fill((AVPicture *) m_PicConvert, m_BufferConvert, - PIX_FMT_RGBA32, m_Width, m_Height); - img_convert((AVPicture *) m_PicConvert, PIX_FMT_RGBA32, - (AVPicture *) m_PicResample, PIX_FMT_YUV420P, - m_Width, m_Height); + avpicture_fill((AVPicture *) m_PicConvert, m_BufferConvert, + PIX_FMT_RGBA32, m_Width, m_Height); + img_convert((AVPicture *) m_PicConvert, PIX_FMT_RGBA32, + (AVPicture *) m_PicResample, PIX_FMT_YUV420P, + m_Width, m_Height); - return 0; + return 0; } double cDecoder::AspectRatio() { #if LIBAVCODEC_BUILD < 4687 - return m_Context->aspect_ratio; + return m_Context->aspect_ratio; #else - return av_q2d(m_Context->sample_aspect_ratio) * (double) m_Context->width / (double) m_Context->height; + return av_q2d(m_Context->sample_aspect_ratio) * (double) m_Context->width / (double) m_Context->height; #endif } |