Skip to content

GitLab

T
tangled
Commit 51b274e8 authored by Matt Menke's avatar Matt Menke Committed by Commit Bot
Browse files
Options

Revert "[webcodecs] Implement Audio/VideoDecoder error callback." 

This reverts commit b930822c.

Reason for revert: Causing build failures due to conflict with https://chromium-review.googlesource.com/c/chromium/src/+/2364075

See, e.g., https://ci.chromium.org/p/chromium/builders/try/linux-libfuzzer-asan-rel/538575?

Original change's description:
> [webcodecs] Implement Audio/VideoDecoder error callback.
> 
> This is implemented in terms of an |is_closed_| state, which prevents
> reentrancy during shutdown.
> 
> Bug: 1045247
> Change-Id: I69e8bd095979f6571fbe95b298f91166b61dc9f3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363998
> Commit-Queue: Dan Sanders <sandersd@chromium.org>
> Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#800282}

TBR=sandersd@chromium.org,chcunningham@chromium.org

Change-Id: Ibff1740b70035b8242c15314cd760976d5a1efc7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1045247
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2368456Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800368}
parent 3c3c4c31
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 325 deletions
third_party/blink/renderer/modules/webcodecs/BUILD.gn
View file @ 51b274e8
......@@ -58,6 +58,7 @@ source_set("unit_tests") {
testonly = true
sources = [
"audio_decoder_broker_test.cc",
"audio_decoder_test.cc",
"decoder_selector_test.cc",
"encoded_video_chunk_test.cc",
"image_decoder_external_test.cc",
......
third_party/blink/renderer/modules/webcodecs/audio_decoder.idl
View file @ 51b274e8
......@@ -56,5 +56,5 @@
// decode requests are aborted.
//
// Not recoverable: make a new AudioDecoder if needed.
[RaisesException] void close();
void close();
};
third_party/blink/renderer/modules/webcodecs/audio_decoder_test.cc 0 → 100644
View file @ 51b274e8
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_testing.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_audio_decoder_init.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
#include "third_party/blink/renderer/modules/webcodecs/audio_decoder.h"
namespace blink {
TEST(AudioDecoderTest, Construction) {
V8TestingScope v8_scope;
auto* init = MakeGarbageCollected<AudioDecoderInit>();
auto* decoder = MakeGarbageCollected<AudioDecoder>(
v8_scope.GetScriptState(), init, v8_scope.GetExceptionState());
EXPECT_EQ(decoder->decodeQueueSize(), 0);
}
} // namespace blink
third_party/blink/renderer/modules/webcodecs/decoder_template.h
View file @ 51b274e8
......@@ -43,7 +43,7 @@ class MODULES_EXPORT DecoderTemplate : public ScriptWrappable {
void decode(const InputType*, ExceptionState&);
ScriptPromise flush(ExceptionState&);
void reset(ExceptionState&);
void close(ExceptionState&);
void close();
// GarbageCollected override.
void Trace(Visitor*) const override;
......@@ -77,7 +77,6 @@ class MODULES_EXPORT DecoderTemplate : public ScriptWrappable {
bool ProcessFlushRequest(Request* request);
bool ProcessResetRequest(Request* request);
void HandleError();
void Shutdown(bool is_error);
// Called by |decoder_|.
void OnInitializeDone(media::Status status);
......@@ -104,8 +103,6 @@ class MODULES_EXPORT DecoderTemplate : public ScriptWrappable {
// TODO(sandersd): Store the last config, flush, and reset so that
// duplicates can be elided.
std::unique_ptr<MediaDecoderType> decoder_;
bool initializing_sync_ = false;
bool is_closed_ = false;
// TODO(sandersd): Can this just be a HashSet by ptr comparison?
uint32_t pending_decode_id_ = 0;
......
third_party/blink/renderer/modules/webcodecs/video_decoder.cc
View file @ 51b274e8
......@@ -71,30 +71,20 @@ CodecConfigEval VideoDecoderTraits::CreateMediaConfig(
return CodecConfigEval::kUnsupported;
}
// TODO(sandersd): Can we allow shared ArrayBuffers?
std::vector<uint8_t> extra_data;
if (config.hasDescription()) {
DOMArrayBuffer* buffer;
if (config.description().IsArrayBuffer()) {
DOMArrayBuffer* buffer = config.description().GetAsArrayBuffer();
uint8_t* start = static_cast<uint8_t*>(buffer->Data());
size_t size = buffer->ByteLengthAsSizeT();
extra_data.assign(start, start + size);
buffer = config.description().GetAsArrayBuffer();
} else {
// TODO(sandersd): Can IsNull() be true?
DCHECK(config.description().IsArrayBufferView());
DOMArrayBufferView* view =
config.description().GetAsArrayBufferView().Get();
uint8_t* start = static_cast<uint8_t*>(view->BaseAddress());
size_t size = view->byteLengthAsSizeT();
extra_data.assign(start, start + size);
buffer = config.description().GetAsArrayBufferView()->buffer();
}
}
// If we allow empty |extra_data| here, FFmpegVideoDecoder will expect an
// Annex B formatted stream.
if (codec == media::kCodecH264 && extra_data.empty()) {
*out_console_message =
"H.264 configuration for must include an avcC description.";
return CodecConfigEval::kInvalid;
// TODO(sandersd): Is it possible to not have Data()?
uint8_t* start = static_cast<uint8_t*>(buffer->Data());
size_t size = buffer->ByteLengthAsSizeT();
extra_data.assign(start, start + size);
}
// TODO(sandersd): Either remove sizes from VideoDecoderConfig (replace with
......
third_party/blink/renderer/modules/webcodecs/video_decoder.idl
View file @ 51b274e8
......@@ -67,10 +67,4 @@
// resolved but before it is fulfilled. In that case the flush() promise will
// be fulfilled successfully even though reset() was called.
[RaisesException] void reset();
// Immediately shut down the decoder and free its resources. All pending
// decode requests are aborted.
//
// Not recoverable: make a new VideoDecoder if needed.
[RaisesException] void close();
};
third_party/blink/web_tests/external/wpt/webcodecs/video-decoder.html
View file @ 51b274e8
......@@ -4,46 +4,6 @@
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
'use strict';
// TODO(sandersd): Move metadata into a helper library.
// TODO(sandersd): Add H.264 idecode test once there is an API to query for
// supported codecs.
let h264 = {
buffer: fetch('h264.mp4').then(r => r.arrayBuffer()),
codec: "avc1.64000c",
description: {offset: 7229, size: 46},
frames: [{offset: 48, size: 4007},
{offset: 4055, size: 926},
{offset: 4981, size: 241},
{offset: 5222, size: 97},
{offset: 5319, size: 98},
{offset: 5417, size: 624},
{offset: 6041, size: 185},
{offset: 6226, size: 94},
{offset: 6320, size: 109},
{offset: 6429, size: 281}]
};
let vp9 = {
buffer: fetch('vp9.mp4').then(r => r.arrayBuffer()),
// TODO(sandersd): Verify that the file is actually level 1.
codec: "vp09.00.10.08",
frames: [{offset: 44, size: 3315},
{offset: 3359, size: 203},
{offset: 3562, size: 245},
{offset: 3807, size: 172},
{offset: 3979, size: 312},
{offset: 4291, size: 170},
{offset: 4461, size: 195},
{offset: 4656, size: 181},
{offset: 4837, size: 356},
{offset: 5193, size: 159}]
};
function view(buffer, {offset, size}) {
return new Uint8Array(buffer, offset, size);
}
// Calls done after giving async output/error callbacks a final chance to run.
async function asyncDone(test) {
......@@ -94,133 +54,5 @@ async_test(async (t) => {
asyncDone(t);
}, 'Test VideoDecoder.configure() codec validity');
promise_test(t => vp9.buffer.then(buffer => {
let numOutputs = 0;
let decoder = new VideoDecoder({
output(frame) {
t.step(() => {
assert_equals(++numOutputs, 1, "outputs");
assert_equals(frame.cropWidth, 320, "cropWidth");
assert_equals(frame.cropHeight, 240, "cropHeight");
assert_equals(frame.timestamp, 0, "timestamp");
frame.destroy();
});
},
error(e) {
t.step(() => {
// TODO(sandersd): Change to 'throw e' once e is defined.
throw "decode error";
});
}
});
decoder.configure({codec: vp9.codec});
decoder.decode(new EncodedVideoChunk('key', 0, view(buffer, vp9.frames[0])));
return decoder.flush().then(() => {
assert_equals(numOutputs, 1, "outputs");
});
}), 'Decode VP9');
promise_test(t => {
let decoder = new VideoDecoder({
output(frame) {
t.step(() => {
throw "unexpected output";
});
},
error(e) {
t.step(() => {
throw "unexpected error";
});
}
});
decoder.close();
let fakeChunk = new EncodedVideoChunk('key', 0, Uint8Array.of(0));
assert_throws_dom("InvalidStateError",
() => decoder.configure({codec: vp9.codec}),
"configure");
assert_throws_dom("InvalidStateError",
() => decoder.decode(fakeChunk),
"reset");
assert_throws_dom("InvalidStateError",
() => decoder.reset(),
"reset");
assert_throws_dom("InvalidStateError",
() => decoder.close(),
"close");
return promise_rejects_dom(t, 'InvalidStateError', decoder.flush(), 'flush');
}, 'Closed decoder');
promise_test(t => {
let numErrors = 0;
let decoder = new VideoDecoder({
output(frame) {
t.step(() => {
throw "unexpected output";
});
},
error(e) {
numErrors++;
}
});
let fakeChunk = new EncodedVideoChunk('key', 0, Uint8Array.of(0));
decoder.decode(fakeChunk);
return decoder.flush().then(
() => { throw "flush succeeded unexpectedly"; },
() => { assert_equals(numErrors, 1, "errors"); });
}, 'Decode without configure');
promise_test(t => {
let numErrors = 0;
let decoder = new VideoDecoder({
output(frame) {
t.step(() => {
throw "unexpected output";
});
},
error(e) {
numErrors++;
}
});
decoder.configure({codec: vp9.codec});
let fakeChunk = new EncodedVideoChunk('key', 0, Uint8Array.of(0));
decoder.decode(fakeChunk);
return decoder.flush().then(
() => { throw "flush succeeded unexpectedly"; },
() => { assert_equals(numErrors, 1, "errors"); });
}, 'Decode corrupt VP9 frame');
promise_test(t => {
let numErrors = 0;
let decoder = new VideoDecoder({
output(frame) {
t.step(() => {
throw "unexpected output";
});
},
error(e) {
numErrors++;
}
});
decoder.configure({codec: vp9.codec});
let fakeChunk = new EncodedVideoChunk('key', 0, Uint8Array.of());
decoder.decode(fakeChunk);
return decoder.flush().then(
() => { throw "flush succeeded unexpectedly"; },
() => { assert_equals(numErrors, 1, "errors"); });
}, 'Decode empty VP9 frame');
</script>
</html>
third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
View file @ 51b274e8
......@@ -8778,7 +8778,6 @@ interface ValidityState
interface VideoDecoder
attribute @@toStringTag
getter decodeQueueSize
method close
method configure
method constructor
method decode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment