Mercurial > libavformat.hg

comparison nut.c @ 370:845f9de2c883 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
author michael
date Wed, 03 Mar 2004 15:41:21 +0000
parents 137b4ce31b0f
children 967c6bb2b8a6
comparison
equal deleted inserted replaced
369:b2a0f47067ed 370:845f9de2c883
454 int cur_stream, nb_streams; 454 int cur_stream, nb_streams;
455 455
456 /* main header */ 456 /* main header */
457 tmp = get_be64(bc); 457 tmp = get_be64(bc);
458 if (tmp != MAIN_STARTCODE) 458 if (tmp != MAIN_STARTCODE)
459 fprintf(stderr, "damaged? startcode!=1 (%Ld)\n", tmp); 459 av_log(s, AV_LOG_ERROR, "damaged? startcode!=1 (%Ld)\n", tmp);
460 get_packetheader(nut, bc); 460 get_packetheader(nut, bc);
461 461
462 tmp = get_v(bc); 462 tmp = get_v(bc);
463 if (tmp != 0) 463 if (tmp != 0)
464 fprintf(stderr, "bad version (%Ld)\n", tmp); 464 av_log(s, AV_LOG_ERROR, "bad version (%Ld)\n", tmp);
465 465
466 nb_streams = get_v(bc); 466 nb_streams = get_v(bc);
467 get_be32(bc); /* checkusm */ 467 get_be32(bc); /* checkusm */
468 468
469 s->bit_rate = 0; 469 s->bit_rate = 0;
479 int class, nom, denom; 479 int class, nom, denom;
480 AVStream *st; 480 AVStream *st;
481 481
482 tmp = get_be64(bc); 482 tmp = get_be64(bc);
483 if (tmp != STREAM_STARTCODE) 483 if (tmp != STREAM_STARTCODE)
484 fprintf(stderr, "damaged? startcode!=1 (%Ld)\n", tmp); 484 av_log(s, AV_LOG_ERROR, "damaged? startcode!=1 (%Ld)\n", tmp);
485 get_packetheader(nut, bc); 485 get_packetheader(nut, bc);
486 st = av_new_stream(s, get_v(bc)); 486 st = av_new_stream(s, get_v(bc));
487 if (!st) 487 if (!st)
488 return AVERROR_NOMEM; 488 return AVERROR_NOMEM;
489 class = get_v(bc); 489 class = get_v(bc);
492 { 492 {
493 case 0: 493 case 0:
494 st->codec.codec_type = CODEC_TYPE_VIDEO; 494 st->codec.codec_type = CODEC_TYPE_VIDEO;
495 st->codec.codec_id = codec_get_bmp_id(tmp); 495 st->codec.codec_id = codec_get_bmp_id(tmp);
496 if (st->codec.codec_id == CODEC_ID_NONE) 496 if (st->codec.codec_id == CODEC_ID_NONE)
497 fprintf(stderr, "Unknown codec?!\n"); 497 av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
498 break; 498 break;
499 case 32: 499 case 32:
500 st->codec.codec_type = CODEC_TYPE_AUDIO; 500 st->codec.codec_type = CODEC_TYPE_AUDIO;
501 st->codec.codec_id = codec_get_wav_id(tmp); 501 st->codec.codec_id = codec_get_wav_id(tmp);
502 if (st->codec.codec_id == CODEC_ID_NONE) 502 if (st->codec.codec_id == CODEC_ID_NONE)
503 fprintf(stderr, "Unknown codec?!\n"); 503 av_log(s, AV_LOG_ERROR, "Unknown codec?!\n");
504 break; 504 break;
505 default: 505 default:
506 fprintf(stderr, "Unknown stream class (%d)\n", class); 506 av_log(s, AV_LOG_ERROR, "Unknown stream class (%d)\n", class);
507 return -1; 507 return -1;
508 } 508 }
509 s->bit_rate += get_v(bc); 509 s->bit_rate += get_v(bc);
510 get_b(bc, NULL, 0); /* language code */ 510 get_b(bc, NULL, 0); /* language code */
511 nom = get_v(bc); 511 nom = get_v(bc);
563 { 563 {
564 key_frame = 1; 564 key_frame = 1;
565 tmp = get_byte(bc); /* flags */ 565 tmp = get_byte(bc); /* flags */
566 } 566 }
567 else 567 else
568 fprintf(stderr, "error in zero bit / startcode %LX\n", tmp); 568 av_log(s, AV_LOG_ERROR, "error in zero bit / startcode %LX\n", tmp);
569 } 569 }
570 get_packetheader(nut, bc); 570 get_packetheader(nut, bc);
571 #if 0 571 #if 0
572 if (((tmp & 0x60)>>5) > 3) /* priority <= 3 */ 572 if (((tmp & 0x60)>>5) > 3) /* priority <= 3 */
573 fprintf(stderr, "sanity check failed!\n"); 573 av_log(s, AV_LOG_ERROR, "sanity check failed!\n");
574 #endif 574 #endif
575 id = get_v(bc); 575 id = get_v(bc);
576 if ((tmp & 0x8) >> 3) 576 if ((tmp & 0x8) >> 3)
577 pts = get_v(bc) << nut->msb_timestamp_shift[id]; 577 pts = get_v(bc) << nut->msb_timestamp_shift[id];
578 pts += get_v(bc); 578 pts += get_v(bc);