mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 23:12:44 +02:00
generic-pc: fix audio
Origin commit data
------------------
Branch: master
Commit: b8a8c07786
Author: martii <m4rtii@gmx.de>
Date: 2013-05-31 (Fri, 31 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -329,7 +329,11 @@ void cAudio::run()
|
|||||||
{
|
{
|
||||||
driver = ao_default_driver_id();
|
driver = ao_default_driver_id();
|
||||||
sformat.bits = 16;
|
sformat.bits = 16;
|
||||||
|
#ifdef MARTII
|
||||||
|
sformat.channels = av_get_channel_layout_nb_channels(c->channels);
|
||||||
|
#else
|
||||||
sformat.channels = c->channels;
|
sformat.channels = c->channels;
|
||||||
|
#endif
|
||||||
sformat.rate = c->sample_rate;
|
sformat.rate = c->sample_rate;
|
||||||
sformat.byte_format = AO_FMT_NATIVE;
|
sformat.byte_format = AO_FMT_NATIVE;
|
||||||
sformat.matrix = 0;
|
sformat.matrix = 0;
|
||||||
@@ -348,8 +352,13 @@ void cAudio::run()
|
|||||||
fprintf(stderr, " %s", ai->options[i]);
|
fprintf(stderr, " %s", ai->options[i]);
|
||||||
fprintf(stderr, "\n");
|
fprintf(stderr, "\n");
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef MARTII
|
||||||
|
lt_info("codec params: sample_fmt %d sample_rate %d channels %d\n",
|
||||||
|
c->sample_fmt, c->sample_rate, av_get_channel_layout_nb_channels(c->channels));
|
||||||
|
#else
|
||||||
lt_info("codec params: sample_fmt %d sample_rate %d channels %d\n",
|
lt_info("codec params: sample_fmt %d sample_rate %d channels %d\n",
|
||||||
c->sample_fmt, c->sample_rate, c->channels);
|
c->sample_fmt, c->sample_rate, c->channels);
|
||||||
|
#endif
|
||||||
while (thread_started) {
|
while (thread_started) {
|
||||||
int gotframe = 0;
|
int gotframe = 0;
|
||||||
if (av_read_frame(avfc, &avpkt) < 0)
|
if (av_read_frame(avfc, &avpkt) < 0)
|
||||||
|
Reference in New Issue
Block a user