mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 14:58:34 +00:00
update to libvpx b46243d from repo https://chromium.googlesource.com/webm/libvpx
This commit is contained in:
1 parent
2b1f0da5c4
commit
8c5f0301f3
1008 files changed
+110139
-201288
No files matched your search
+24
-32
@@ -13,20 +13,20 @@
|
||||
#include <cstring>
|
||||
#include <cstdio>
|
||||
|
||||
#include "third_party/libwebm/mkvparser.hpp"
|
||||
#include "third_party/libwebm/mkvreader.hpp"
|
||||
#include "third_party/libwebm/mkvparser/mkvparser.h"
|
||||
#include "third_party/libwebm/mkvparser/mkvreader.h"
|
||||
|
||||
namespace {
|
||||
|
||||
void reset(struct WebmInputContext *const webm_ctx) {
|
||||
if (webm_ctx->reader != NULL) {
|
||||
mkvparser::MkvReader *const reader =
|
||||
reinterpret_cast<mkvparser::MkvReader*>(webm_ctx->reader);
|
||||
reinterpret_cast<mkvparser::MkvReader *>(webm_ctx->reader);
|
||||
delete reader;
|
||||
}
|
||||
if (webm_ctx->segment != NULL) {
|
||||
mkvparser::Segment *const segment =
|
||||
reinterpret_cast<mkvparser::Segment*>(webm_ctx->segment);
|
||||
reinterpret_cast<mkvparser::Segment *>(webm_ctx->segment);
|
||||
delete segment;
|
||||
}
|
||||
if (webm_ctx->buffer != NULL) {
|
||||
@@ -46,7 +46,7 @@ void reset(struct WebmInputContext *const webm_ctx) {
|
||||
|
||||
void get_first_cluster(struct WebmInputContext *const webm_ctx) {
|
||||
mkvparser::Segment *const segment =
|
||||
reinterpret_cast<mkvparser::Segment*>(webm_ctx->segment);
|
||||
reinterpret_cast<mkvparser::Segment *>(webm_ctx->segment);
|
||||
const mkvparser::Cluster *const cluster = segment->GetFirst();
|
||||
webm_ctx->cluster = cluster;
|
||||
}
|
||||
@@ -72,7 +72,7 @@ int file_is_webm(struct WebmInputContext *webm_ctx,
|
||||
return 0;
|
||||
}
|
||||
|
||||
mkvparser::Segment* segment;
|
||||
mkvparser::Segment *segment;
|
||||
if (mkvparser::Segment::CreateInstance(reader, pos, segment)) {
|
||||
rewind_and_reset(webm_ctx, vpx_ctx);
|
||||
return 0;
|
||||
@@ -84,12 +84,12 @@ int file_is_webm(struct WebmInputContext *webm_ctx,
|
||||
}
|
||||
|
||||
const mkvparser::Tracks *const tracks = segment->GetTracks();
|
||||
const mkvparser::VideoTrack* video_track = NULL;
|
||||
const mkvparser::VideoTrack *video_track = NULL;
|
||||
for (unsigned long i = 0; i < tracks->GetTracksCount(); ++i) {
|
||||
const mkvparser::Track* const track = tracks->GetTrackByIndex(i);
|
||||
const mkvparser::Track *const track = tracks->GetTrackByIndex(i);
|
||||
if (track->GetType() == mkvparser::Track::kVideo) {
|
||||
video_track = static_cast<const mkvparser::VideoTrack*>(track);
|
||||
webm_ctx->video_track_index = track->GetNumber();
|
||||
video_track = static_cast<const mkvparser::VideoTrack *>(track);
|
||||
webm_ctx->video_track_index = static_cast<int>(track->GetNumber());
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -103,8 +103,6 @@ int file_is_webm(struct WebmInputContext *webm_ctx,
|
||||
vpx_ctx->fourcc = VP8_FOURCC;
|
||||
} else if (!strncmp(video_track->GetCodecId(), "V_VP9", 5)) {
|
||||
vpx_ctx->fourcc = VP9_FOURCC;
|
||||
} else if (!strncmp(video_track->GetCodecId(), "V_VP10", 6)) {
|
||||
vpx_ctx->fourcc = VP10_FOURCC;
|
||||
} else {
|
||||
rewind_and_reset(webm_ctx, vpx_ctx);
|
||||
return 0;
|
||||
@@ -120,9 +118,7 @@ int file_is_webm(struct WebmInputContext *webm_ctx,
|
||||
return 1;
|
||||
}
|
||||
|
||||
int webm_read_frame(struct WebmInputContext *webm_ctx,
|
||||
uint8_t **buffer,
|
||||
size_t *bytes_in_buffer,
|
||||
int webm_read_frame(struct WebmInputContext *webm_ctx, uint8_t **buffer,
|
||||
size_t *buffer_size) {
|
||||
// This check is needed for frame parallel decoding, in which case this
|
||||
// function could be called even after it has reached end of input stream.
|
||||
@@ -130,13 +126,13 @@ int webm_read_frame(struct WebmInputContext *webm_ctx,
|
||||
return 1;
|
||||
}
|
||||
mkvparser::Segment *const segment =
|
||||
reinterpret_cast<mkvparser::Segment*>(webm_ctx->segment);
|
||||
const mkvparser::Cluster* cluster =
|
||||
reinterpret_cast<const mkvparser::Cluster*>(webm_ctx->cluster);
|
||||
reinterpret_cast<mkvparser::Segment *>(webm_ctx->segment);
|
||||
const mkvparser::Cluster *cluster =
|
||||
reinterpret_cast<const mkvparser::Cluster *>(webm_ctx->cluster);
|
||||
const mkvparser::Block *block =
|
||||
reinterpret_cast<const mkvparser::Block*>(webm_ctx->block);
|
||||
reinterpret_cast<const mkvparser::Block *>(webm_ctx->block);
|
||||
const mkvparser::BlockEntry *block_entry =
|
||||
reinterpret_cast<const mkvparser::BlockEntry*>(webm_ctx->block_entry);
|
||||
reinterpret_cast<const mkvparser::BlockEntry *>(webm_ctx->block_entry);
|
||||
bool block_entry_eos = false;
|
||||
do {
|
||||
long status = 0;
|
||||
@@ -147,7 +143,7 @@ int webm_read_frame(struct WebmInputContext *webm_ctx,
|
||||
} else if (block_entry_eos || block_entry->EOS()) {
|
||||
cluster = segment->GetNext(cluster);
|
||||
if (cluster == NULL || cluster->EOS()) {
|
||||
*bytes_in_buffer = 0;
|
||||
*buffer_size = 0;
|
||||
webm_ctx->reached_eos = 1;
|
||||
return 1;
|
||||
}
|
||||
@@ -164,7 +160,7 @@ int webm_read_frame(struct WebmInputContext *webm_ctx,
|
||||
}
|
||||
get_new_block = true;
|
||||
}
|
||||
if (status) {
|
||||
if (status || block_entry == NULL) {
|
||||
return -1;
|
||||
}
|
||||
if (get_new_block) {
|
||||
@@ -178,24 +174,23 @@ int webm_read_frame(struct WebmInputContext *webm_ctx,
|
||||
webm_ctx->block_entry = block_entry;
|
||||
webm_ctx->block = block;
|
||||
|
||||
const mkvparser::Block::Frame& frame =
|
||||
const mkvparser::Block::Frame &frame =
|
||||
block->GetFrame(webm_ctx->block_frame_index);
|
||||
++webm_ctx->block_frame_index;
|
||||
if (frame.len > static_cast<long>(*buffer_size)) {
|
||||
delete[] *buffer;
|
||||
delete[] * buffer;
|
||||
*buffer = new uint8_t[frame.len];
|
||||
if (*buffer == NULL) {
|
||||
return -1;
|
||||
}
|
||||
*buffer_size = frame.len;
|
||||
webm_ctx->buffer = *buffer;
|
||||
}
|
||||
*bytes_in_buffer = frame.len;
|
||||
*buffer_size = frame.len;
|
||||
webm_ctx->timestamp_ns = block->GetTime(cluster);
|
||||
webm_ctx->is_key_frame = block->IsKey();
|
||||
|
||||
mkvparser::MkvReader *const reader =
|
||||
reinterpret_cast<mkvparser::MkvReader*>(webm_ctx->reader);
|
||||
reinterpret_cast<mkvparser::MkvReader *>(webm_ctx->reader);
|
||||
return frame.Read(reader, *buffer) ? -1 : 0;
|
||||
}
|
||||
|
||||
@@ -203,10 +198,9 @@ int webm_guess_framerate(struct WebmInputContext *webm_ctx,
|
||||
struct VpxInputContext *vpx_ctx) {
|
||||
uint32_t i = 0;
|
||||
uint8_t *buffer = NULL;
|
||||
size_t bytes_in_buffer = 0;
|
||||
size_t buffer_size = 0;
|
||||
while (webm_ctx->timestamp_ns < 1000000000 && i < 50) {
|
||||
if (webm_read_frame(webm_ctx, &buffer, &bytes_in_buffer, &buffer_size)) {
|
||||
if (webm_read_frame(webm_ctx, &buffer, &buffer_size)) {
|
||||
break;
|
||||
}
|
||||
++i;
|
||||
@@ -226,6 +220,4 @@ int webm_guess_framerate(struct WebmInputContext *webm_ctx,
|
||||
return 0;
|
||||
}
|
||||
|
||||
void webm_free(struct WebmInputContext *webm_ctx) {
|
||||
reset(webm_ctx);
|
||||
}
|
||||
void webm_free(struct WebmInputContext *webm_ctx) { reset(webm_ctx); }
|
||||
Reference in new issue
Block a user