mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

libgeneric-pc: reduce ffmpeg warnings

Browse Source 
Origin commit data
------------------
Branch: master
Commit: fe1abb806e
Author: max_10 <max_10@gmx.de>
Date: 2019-05-17 (Fri, 17 May 2019)

Origin message was:
------------------
- libgeneric-pc: reduce ffmpeg warnings

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2019-05-17 10:39:36 +02:00
committed by vanhofen
parent 7584a2db7f
commit 953bb23760
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libgeneric-pc/audio.cpp
View File

@@ -336,7 +336,9 @@ void cAudio::run()
{ {
hal_info("====================== start decoder thread ================================\n"); hal_info("====================== start decoder thread ================================\n");
/* libavcodec & friends */ /* libavcodec & friends */
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
av_register_all(); av_register_all();
#endif
AVCodec *codec; AVCodec *codec;
AVFormatContext *avfc = NULL; AVFormatContext *avfc = NULL;
@@ -473,7 +475,11 @@ void cAudio::run()
} }
obuf_sz = swr_convert(swr, &obuf, obuf_sz, obuf_sz = swr_convert(swr, &obuf, obuf_sz,
(const uint8_t **)frame->extended_data, frame->nb_samples); (const uint8_t **)frame->extended_data, frame->nb_samples);
#if (LIBAVUTIL_VERSION_MAJOR < 54)
curr_pts = av_frame_get_best_effort_timestamp(frame); curr_pts = av_frame_get_best_effort_timestamp(frame);
#else
curr_pts = frame->best_effort_timestamp;
#endif
hal_debug("%s: pts 0x%" PRIx64 " %3f\n", __func__, curr_pts, curr_pts/90000.0); hal_debug("%s: pts 0x%" PRIx64 " %3f\n", __func__, curr_pts, curr_pts/90000.0);
int o_buf_sz = av_samples_get_buffer_size(&out_linesize, o_ch, int o_buf_sz = av_samples_get_buffer_size(&out_linesize, o_ch,
obuf_sz, AV_SAMPLE_FMT_S16, 1); obuf_sz, AV_SAMPLE_FMT_S16, 1);

10
libgeneric-pc/video.cpp
View File

@@ -77,7 +77,9 @@ static const AVRational aspect_ratios[6] = {
cVideo::cVideo(int, void *, void *, unsigned int) cVideo::cVideo(int, void *, void *, unsigned int)
{ {
hal_debug("%s\n", __func__); hal_debug("%s\n", __func__);
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
av_register_all(); av_register_all();
#endif
if (!HAL_nodec) if (!HAL_nodec)
dmxbuf = (uint8_t *)malloc(DMX_BUF_SZ); dmxbuf = (uint8_t *)malloc(DMX_BUF_SZ);
bufpos = 0; bufpos = 0;
@@ -575,7 +577,11 @@ void cVideo::run(void)
} }
f->width(c->width); f->width(c->width);
f->height(c->height); f->height(c->height);
#if (LIBAVUTIL_VERSION_MAJOR < 54)
int64_t vpts = av_frame_get_best_effort_timestamp(frame); int64_t vpts = av_frame_get_best_effort_timestamp(frame);
#else
int64_t vpts = frame->best_effort_timestamp;
#endif
/* a/v delay determined experimentally :-) */ /* a/v delay determined experimentally :-) */
#if USE_OPENGL #if USE_OPENGL
if (v_format == VIDEO_FORMAT_MPEG2) if (v_format == VIDEO_FORMAT_MPEG2)
@@ -605,7 +611,11 @@ void cVideo::run(void)
} }
hal_debug("%s: time_base: %d/%d, ticks: %d rate: %d pts 0x%" PRIx64 "\n", __func__, hal_debug("%s: time_base: %d/%d, ticks: %d rate: %d pts 0x%" PRIx64 "\n", __func__,
c->time_base.num, c->time_base.den, c->ticks_per_frame, dec_r, c->time_base.num, c->time_base.den, c->ticks_per_frame, dec_r,
#if (LIBAVUTIL_VERSION_MAJOR < 54)
av_frame_get_best_effort_timestamp(frame)); av_frame_get_best_effort_timestamp(frame));
#else
frame->best_effort_timestamp);
#endif
} else } else
hal_debug("%s: got_frame: %d stillpicture: %d\n", __func__, got_frame, stillpicture); hal_debug("%s: got_frame: %d stillpicture: %d\n", __func__, got_frame, stillpicture);
still_m.unlock(); still_m.unlock();