| @@ -206,14 +206,14 @@ static int mjpeg_probe(AVProbeData *p) · 205 unmodified lines |
| 206 | FF_DEF_RAWVIDEO_DEMUXER2(mjpeg, "raw MJPEG video", mjpeg_probe, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS) | 206 | FF_DEF_RAWVIDEO_DEMUXER2(mjpeg, "raw MJPEG video", mjpeg_probe, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS) |
| 207 | #endif | 207 | #endif |
| 208 | | 208 | |
| 209 | #if CONFIG_MLP_DEMUXER | 209 | #if CONFIG_MLP_DEMUXER || CONFIG_TRUEHD_DEMUXER |
| 210 | static int mlp_probe(AVProbeData *p) | 210 | static int av_always_inline mlp_thd_probe(AVProbeData *p, uint32_t sync) |
| 211 | { | 211 | { |
| 212 | const uint8_t *buf, *last_buf = p->buf, *end = p->buf + p->buf_size; | 212 | const uint8_t *buf, *last_buf = p->buf, *end = p->buf + p->buf_size; |
| 213 | int frames = 0, valid = 0, size = 0; | 213 | int frames = 0, valid = 0, size = 0; |
| 214 | | 214 | |
| 215 | for (buf = p->buf; buf + 8 <= end; buf++) { | 215 | for (buf = p->buf; buf + 8 <= end; buf++) { |
| 216 | if (AV_RB32(buf + 4) == 0xf8726fbb) { | 216 | if (AV_RB32(buf + 4) == sync) { |
| 217 | frames++; | 217 | frames++; |
| 218 | if (last_buf + size == buf) { | 218 | if (last_buf + size == buf) { |
| 219 | valid++; | 219 | valid++; |
| @@ -228,6 +228,13 @@ static int mlp_probe(AVProbeData *p) · 8 unmodified lines |
| 228 | return AVPROBE_SCORE_MAX; | 228 | return AVPROBE_SCORE_MAX; |
| 229 | return 0; | 229 | return 0; |
| 230 | } | 230 | } |
| | 231 | #endif |
| | 232 | |
| | 233 | #if CONFIG_MLP_DEMUXER |
| | 234 | static int mlp_probe(AVProbeData *p) |
| | 235 | { |
| | 236 | return mlp_thd_probe(p, 0xf8726fbb); |
| | 237 | } |
| 231 | | 238 | |
| 232 | AVInputFormat ff_mlp_demuxer = { | 239 | AVInputFormat ff_mlp_demuxer = { |
| 233 | .name = "mlp", | 240 | .name = "mlp", |
| @@ -242,9 +249,15 @@ AVInputFormat ff_mlp_demuxer = { · 8 unmodified lines |
| 242 | #endif | 249 | #endif |
| 243 | | 250 | |
| 244 | #if CONFIG_TRUEHD_DEMUXER | 251 | #if CONFIG_TRUEHD_DEMUXER |
| | 252 | static int thd_probe(AVProbeData *p) |
| | 253 | { |
| | 254 | return mlp_thd_probe(p, 0xf8726fba); |
| | 255 | } |
| | 256 | |
| 245 | AVInputFormat ff_truehd_demuxer = { | 257 | AVInputFormat ff_truehd_demuxer = { |
| 246 | .name = "truehd", | 258 | .name = "truehd", |
| 247 | .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), | 259 | .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), |
| | 260 | .read_probe = thd_probe, |
| 248 | .read_header = ff_raw_audio_read_header, | 261 | .read_header = ff_raw_audio_read_header, |
| 249 | .read_packet = ff_raw_read_partial_packet, | 262 | .read_packet = ff_raw_read_partial_packet, |
| 250 | .flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS, | 263 | .flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS, |