aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/gnunet-helper-audio-playback.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/conversation/gnunet-helper-audio-playback.c')
-rw-r--r--src/conversation/gnunet-helper-audio-playback.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c
index d7e1cd036..dfa400d71 100644
--- a/src/conversation/gnunet-helper-audio-playback.c
+++ b/src/conversation/gnunet-helper-audio-playback.c
@@ -262,6 +262,7 @@ write_wav_header ()
262 return ! ret ? -1 : 16; 262 return ! ret ? -1 : 16;
263} 263}
264 264
265
265#endif 266#endif
266 267
267 268
@@ -397,7 +398,7 @@ ogg_demux_and_decode ()
397 { 398 {
398 /*OggOpus streams are identified by a magic string in the initial 399 /*OggOpus streams are identified by a magic string in the initial
399 stream header.*/ 400 stream header.*/
400 if (op.b_o_s &&(op.bytes >= 8) && ! memcmp (op.packet, "OpusHead", 8)) 401 if (op.b_o_s && (op.bytes >= 8) && ! memcmp (op.packet, "OpusHead", 8))
401 { 402 {
402 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 403 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
403 "Got Opus Header\n"); 404 "Got Opus Header\n");
@@ -418,7 +419,7 @@ ogg_demux_and_decode ()
418 } 419 }
419 if (! has_opus_stream) 420 if (! has_opus_stream)
420 { 421 {
421 if ((packet_count > 0) &&(opus_serialno == os.serialno) ) 422 if ((packet_count > 0) && (opus_serialno == os.serialno) )
422 { 423 {
423 fprintf (stderr, 424 fprintf (stderr,
424 "\nError: Apparent chaining without changing serial number (%" 425 "\nError: Apparent chaining without changing serial number (%"
@@ -443,7 +444,7 @@ ogg_demux_and_decode ()
443 (int64_t) os.serialno); 444 (int64_t) os.serialno);
444 } 445 }
445 } 446 }
446 if (! has_opus_stream ||(os.serialno != opus_serialno) ) 447 if (! has_opus_stream || (os.serialno != opus_serialno) )
447 { 448 {
448 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 449 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
449 "breaking out\n"); 450 "breaking out\n");
@@ -458,9 +459,9 @@ ogg_demux_and_decode ()
458 if (! dec) 459 if (! dec)
459 quit (1); 460 quit (1);
460 461
461 if ((0 != ogg_stream_packetout (&os, &op)) ||(255 == 462 if ((0 != ogg_stream_packetout (&os, &op)) || (255 ==
462 og.header[og.header_len 463 og.header[og.header_len
463 - 1]) ) 464 - 1]) )
464 { 465 {
465 /*The format specifies that the initial header and tags packets are on their 466 /*The format specifies that the initial header and tags packets are on their
466 own pages. To aid implementors in discovering that their files are wrong 467 own pages. To aid implementors in discovering that their files are wrong
@@ -490,9 +491,9 @@ ogg_demux_and_decode ()
490 else if (1 == packet_count) 491 else if (1 == packet_count)
491 { 492 {
492 has_tags_packet = 1; 493 has_tags_packet = 1;
493 if ((0 != ogg_stream_packetout (&os, &op)) ||(255 == 494 if ((0 != ogg_stream_packetout (&os, &op)) || (255 ==
494 og.header[og.header_len 495 og.header[og.header_len
495 - 1]) ) 496 - 1]) )
496 { 497 {
497 fprintf (stderr, 498 fprintf (stderr,
498 "Extra packets on initial tags page. Invalid stream.\n"); 499 "Extra packets on initial tags page. Invalid stream.\n");
@@ -506,7 +507,7 @@ ogg_demux_and_decode ()
506 int64_t outsamp; 507 int64_t outsamp;
507 508
508 /*End of stream condition*/ 509 /*End of stream condition*/
509 if (op.e_o_s &&(os.serialno == opus_serialno) ) 510 if (op.e_o_s && (os.serialno == opus_serialno) )
510 { 511 {
511 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 512 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
512 "Got EOS\n"); 513 "Got EOS\n");