X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frpl.c;h=6afd373810098dd600920d5db8209173a6526782;hb=e26fb6a714f6d86aca05361a0bab7eb84ef642f4;hp=d37360047860073b44d18d921eb400187222e1a2;hpb=94d98330ed6c5562341315c26c1af92771a2e6de;p=ffmpeg diff --git a/libavformat/rpl.c b/libavformat/rpl.c index d3736004786..6afd3738100 100644 --- a/libavformat/rpl.c +++ b/libavformat/rpl.c @@ -33,7 +33,7 @@ /** 256 is arbitrary, but should be big enough for any reasonable file. */ #define RPL_LINE_LENGTH 256 -static int rpl_probe(AVProbeData *p) +static int rpl_probe(const AVProbeData *p) { if (memcmp(p->buf, RPL_SIGNATURE, RPL_SIGNATURE_SIZE)) return 0; @@ -119,10 +119,12 @@ static int rpl_read_header(AVFormatContext *s) AVStream *vst = NULL, *ast = NULL; int total_audio_size; int error = 0; + const char *endptr; + char audio_type[RPL_LINE_LENGTH]; uint32_t i; - int32_t audio_format, chunk_catalog_offset, number_of_chunks; + int32_t video_format, audio_format, chunk_catalog_offset, number_of_chunks; AVRational fps; char line[RPL_LINE_LENGTH]; @@ -142,39 +144,47 @@ static int rpl_read_header(AVFormatContext *s) av_dict_set(&s->metadata, "author" , line, 0); // video headers - vst = avformat_new_stream(s, NULL); - if (!vst) - return AVERROR(ENOMEM); - vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codecpar->codec_tag = read_line_and_int(pb, &error); // video format - vst->codecpar->width = read_line_and_int(pb, &error); // video width - vst->codecpar->height = read_line_and_int(pb, &error); // video height - vst->codecpar->bits_per_coded_sample = read_line_and_int(pb, &error); // video bits per sample - error |= read_line(pb, line, sizeof(line)); // video frames per second - fps = read_fps(line, &error); - avpriv_set_pts_info(vst, 32, fps.den, fps.num); - - // Figure out the video codec - switch (vst->codecpar->codec_tag) { + video_format = read_line_and_int(pb, &error); + if (video_format) { + vst = avformat_new_stream(s, NULL); + if (!vst) + return AVERROR(ENOMEM); + vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + vst->codecpar->codec_tag = video_format; + vst->codecpar->width = read_line_and_int(pb, &error); // video width + vst->codecpar->height = read_line_and_int(pb, &error); // video height + vst->codecpar->bits_per_coded_sample = read_line_and_int(pb, &error); // video bits per sample + + // Figure out the video codec + switch (vst->codecpar->codec_tag) { #if 0 - case 122: - vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE122; - break; + case 122: + vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE122; + break; #endif - case 124: - vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE124; - // The header is wrong here, at least sometimes - vst->codecpar->bits_per_coded_sample = 16; - break; - case 130: - vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE130; - break; - default: - avpriv_report_missing_feature(s, "Video format %s", - av_fourcc2str(vst->codecpar->codec_tag)); - vst->codecpar->codec_id = AV_CODEC_ID_NONE; + case 124: + vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE124; + // The header is wrong here, at least sometimes + vst->codecpar->bits_per_coded_sample = 16; + break; + case 130: + vst->codecpar->codec_id = AV_CODEC_ID_ESCAPE130; + break; + default: + avpriv_report_missing_feature(s, "Video format %s", + av_fourcc2str(vst->codecpar->codec_tag)); + vst->codecpar->codec_id = AV_CODEC_ID_NONE; + } + } else { + for (i = 0; i < 3; i++) + error |= read_line(pb, line, sizeof(line)); } + error |= read_line(pb, line, sizeof(line)); // video frames per second + fps = read_fps(line, &error); + if (vst) + avpriv_set_pts_info(vst, 32, fps.den, fps.num); + // Audio headers // ARMovie supports multiple audio tracks; I don't have any @@ -188,7 +198,9 @@ static int rpl_read_header(AVFormatContext *s) ast->codecpar->codec_tag = audio_format; ast->codecpar->sample_rate = read_line_and_int(pb, &error); // audio bitrate ast->codecpar->channels = read_line_and_int(pb, &error); // number of audio channels - ast->codecpar->bits_per_coded_sample = read_line_and_int(pb, &error); // audio bits per sample + error |= read_line(pb, line, sizeof(line)); + ast->codecpar->bits_per_coded_sample = read_int(line, &endptr, &error); // audio bits per sample + av_strlcpy(audio_type, endptr, RPL_LINE_LENGTH); // At least one sample uses 0 for ADPCM, which is really 4 bits // per sample. if (ast->codecpar->bits_per_coded_sample == 0) @@ -205,6 +217,17 @@ static int rpl_read_header(AVFormatContext *s) // 16-bit audio is always signed ast->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; break; + } else if (ast->codecpar->bits_per_coded_sample == 8) { + if(av_stristr(audio_type, "unsigned") != NULL) { + ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8; + break; + } else if(av_stristr(audio_type, "linear") != NULL) { + ast->codecpar->codec_id = AV_CODEC_ID_PCM_S8; + break; + } else { + ast->codecpar->codec_id = AV_CODEC_ID_PCM_VIDC; + break; + } } // There are some other formats listed as legal per the spec; // samples needed. @@ -231,7 +254,7 @@ static int rpl_read_header(AVFormatContext *s) } rpl->frames_per_chunk = read_line_and_int(pb, &error); // video frames per chunk - if (rpl->frames_per_chunk > 1 && vst->codecpar->codec_tag != 124) + if (vst && rpl->frames_per_chunk > 1 && vst->codecpar->codec_tag != 124) av_log(s, AV_LOG_WARNING, "Don't know how to split frames for video format %s. " "Video stream will be broken!\n", av_fourcc2str(vst->codecpar->codec_tag)); @@ -246,7 +269,10 @@ static int rpl_read_header(AVFormatContext *s) read_line_and_int(pb, &error); // (file index) error |= read_line(pb, line, sizeof(line)); // offset to "helpful" sprite error |= read_line(pb, line, sizeof(line)); // size of "helpful" sprite - error |= read_line(pb, line, sizeof(line)); // offset to key frame list + if (vst) { + error |= read_line(pb, line, sizeof(line)); // offset to key frame list + vst->duration = number_of_chunks * rpl->frames_per_chunk; + } // Read the index avio_seek(pb, chunk_catalog_offset, SEEK_SET); @@ -259,8 +285,9 @@ static int rpl_read_header(AVFormatContext *s) error = -1; continue; } - av_add_index_entry(vst, offset, i * rpl->frames_per_chunk, - video_size, rpl->frames_per_chunk, 0); + if (vst) + av_add_index_entry(vst, offset, i * rpl->frames_per_chunk, + video_size, rpl->frames_per_chunk, 0); if (ast) av_add_index_entry(ast, offset + video_size, total_audio_size, audio_size, audio_size * 8, 0);