Attachment #864334 for bug #908959

View | Details | Raw Unified | Return to bug 908959
Collapse All | Expand All

Lines 114-120 Link Here

(-)a/DllAvFormat.h (-1 / +1 lines)
114	}	114	}
115	virtual void av_register_all_dont_call() { (volatile int )0x0 = 0; }	115	virtual void av_register_all_dont_call() { (volatile int )0x0 = 0; }
116	virtual AVInputFormat av_find_input_format(const char short_name) { return ::av_find_input_format(short_name); }	116	virtual AVInputFormat av_find_input_format(const char short_name) { return ::av_find_input_format(short_name); }
117	virtual int url_feof(AVIOContext *s) { return ::url_feof(s); }	117	virtual int url_feof(AVIOContext *s) { return ::avio_feof(s); }
118	virtual void avformat_close_input(AVFormatContext **s) { ::avformat_close_input(s); }	118	virtual void avformat_close_input(AVFormatContext **s) { ::avformat_close_input(s); }
119	virtual int av_read_frame(AVFormatContext s, AVPacket pkt) { return ::av_read_frame(s, pkt); }	119	virtual int av_read_frame(AVFormatContext s, AVPacket pkt) { return ::av_read_frame(s, pkt); }
120	virtual int av_read_play(AVFormatContext *s) { return ::av_read_play(s); }	120	virtual int av_read_play(AVFormatContext *s) { return ::av_read_play(s); }




  m_pCodecContext->debug = 0;
  m_pCodecContext->workaround_bugs = 1;

  if (pCodec->capabilities & AV_CODEC_CAP_TRUNCATED)
      m_pCodecContext->flags |= AV_CODEC_FLAG_TRUNCATED;

  m_channels = 0;
  m_pCodecContext->channels = hints.channels;

  if( hints.extradata && hints.extrasize > 0 )
  {
    m_pCodecContext->extradata_size = hints.extrasize;
    m_pCodecContext->extradata = (uint8_t*)m_dllAvUtil.av_mallocz(hints.extrasize + AV_INPUT_BUFFER_PADDING_SIZE);
    memcpy(m_pCodecContext->extradata, hints.extradata, hints.extrasize);
  }



  if (m_iBufferOutputAlloced < m_iBufferOutputUsed + outputSize)
  {
     m_pBufferOutput = (BYTE*)m_dllAvUtil.av_realloc(m_pBufferOutput, m_iBufferOutputUsed + outputSize + AV_INPUT_BUFFER_PADDING_SIZE);
     m_iBufferOutputAlloced = m_iBufferOutputUsed + outputSize;
  }


Lines 1022-1028 Link Here

(-)a/OMXReader.cpp (-2 / +2 lines)
1022	{	1022	{
1023	memset(pkt, 0, sizeof(OMXPacket));	1023	memset(pkt, 0, sizeof(OMXPacket));
1024		1024
1025	pkt->data = (uint8_t*) malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);	1025	pkt->data = (uint8_t*) malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
1026	if(!pkt->data)	1026	if(!pkt->data)
1027	{	1027	{
1028	free(pkt);	1028	free(pkt);
Lines 1030-1036 Link Here
1030	}	1030	}
1031	else	1031	else
1032	{	1032	{
1033	memset(pkt->data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);	1033	memset(pkt->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
1034	pkt->size = size;	1034	pkt->size = size;
1035	pkt->dts = DVD_NOPTS_VALUE;	1035	pkt->dts = DVD_NOPTS_VALUE;
1036	pkt->pts = DVD_NOPTS_VALUE;	1036	pkt->pts = DVD_NOPTS_VALUE;

Return to bug 908959

Lines 82-89 Link Here

(-)a/OMXAudioCodecOMX.cpp (-4 / +4 lines)
82	m_pCodecContext->debug = 0;	82	m_pCodecContext->debug = 0;
83	m_pCodecContext->workaround_bugs = 1;	83	m_pCodecContext->workaround_bugs = 1;
84		84
85	if (pCodec->capabilities & CODEC_CAP_TRUNCATED)	85	if (pCodec->capabilities & AV_CODEC_CAP_TRUNCATED)
86	m_pCodecContext->flags \|= CODEC_FLAG_TRUNCATED;	86	m_pCodecContext->flags \|= AV_CODEC_FLAG_TRUNCATED;
87		87
88	m_channels = 0;	88	m_channels = 0;
89	m_pCodecContext->channels = hints.channels;	89	m_pCodecContext->channels = hints.channels;
Lines 115-121 Link Here
115	if( hints.extradata && hints.extrasize > 0 )	115	if( hints.extradata && hints.extrasize > 0 )
116	{	116	{
117	m_pCodecContext->extradata_size = hints.extrasize;	117	m_pCodecContext->extradata_size = hints.extrasize;
118	m_pCodecContext->extradata = (uint8_t*)m_dllAvUtil.av_mallocz(hints.extrasize + FF_INPUT_BUFFER_PADDING_SIZE);	118	m_pCodecContext->extradata = (uint8_t*)m_dllAvUtil.av_mallocz(hints.extrasize + AV_INPUT_BUFFER_PADDING_SIZE);
119	memcpy(m_pCodecContext->extradata, hints.extradata, hints.extrasize);	119	memcpy(m_pCodecContext->extradata, hints.extradata, hints.extrasize);
120	}	120	}
121		121
Lines 235-241 Link Here
235		235
236	if (m_iBufferOutputAlloced < m_iBufferOutputUsed + outputSize)	236	if (m_iBufferOutputAlloced < m_iBufferOutputUsed + outputSize)
237	{	237	{
238	m_pBufferOutput = (BYTE*)m_dllAvUtil.av_realloc(m_pBufferOutput, m_iBufferOutputUsed + outputSize + FF_INPUT_BUFFER_PADDING_SIZE);	238	m_pBufferOutput = (BYTE*)m_dllAvUtil.av_realloc(m_pBufferOutput, m_iBufferOutputUsed + outputSize + AV_INPUT_BUFFER_PADDING_SIZE);
239	m_iBufferOutputAlloced = m_iBufferOutputUsed + outputSize;	239	m_iBufferOutputAlloced = m_iBufferOutputUsed + outputSize;
240	}	240	}
241		241