Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: content/common/gpu/media/video_encode_accelerator_unittest.cc

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix compile errors Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <inttypes.h> 5 #include <inttypes.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <queue> 9 #include <queue>
10 #include <string> 10 #include <string>
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 media::COLOR_SPACE_UNSPECIFIED, coded_size, visible_size, 672 media::COLOR_SPACE_UNSPECIFIED, coded_size, visible_size,
673 natural_size, media::EmptyExtraData(), false); 673 natural_size, media::EmptyExtraData(), false);
674 else if (IsH264(profile_)) 674 else if (IsH264(profile_))
675 config.Initialize(media::kCodecH264, media::H264PROFILE_MAIN, kInputFormat, 675 config.Initialize(media::kCodecH264, media::H264PROFILE_MAIN, kInputFormat,
676 media::COLOR_SPACE_UNSPECIFIED, coded_size, visible_size, 676 media::COLOR_SPACE_UNSPECIFIED, coded_size, visible_size,
677 natural_size, media::EmptyExtraData(), false); 677 natural_size, media::EmptyExtraData(), false);
678 else 678 else
679 LOG_ASSERT(0) << "Invalid profile " << profile_; 679 LOG_ASSERT(0) << "Invalid profile " << profile_;
680 680
681 decoder_->Initialize( 681 decoder_->Initialize(
682 config, false, media::SetCdmReadyCB(), 682 config, false, nullptr,
683 base::Bind(&VideoFrameQualityValidator::InitializeCB, 683 base::Bind(&VideoFrameQualityValidator::InitializeCB,
684 base::Unretained(this)), 684 base::Unretained(this)),
685 base::Bind(&VideoFrameQualityValidator::VerifyOutputFrame, 685 base::Bind(&VideoFrameQualityValidator::VerifyOutputFrame,
686 base::Unretained(this))); 686 base::Unretained(this)));
687 } 687 }
688 688
689 void VideoFrameQualityValidator::InitializeCB(bool success) { 689 void VideoFrameQualityValidator::InitializeCB(bool success) {
690 if (success) { 690 if (success) {
691 decoder_state_ = INITIALIZED; 691 decoder_state_ = INITIALIZED;
692 Decode(); 692 Decode();
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1783 1783
1784 content::g_env = 1784 content::g_env =
1785 reinterpret_cast<content::VideoEncodeAcceleratorTestEnvironment*>( 1785 reinterpret_cast<content::VideoEncodeAcceleratorTestEnvironment*>(
1786 testing::AddGlobalTestEnvironment( 1786 testing::AddGlobalTestEnvironment(
1787 new content::VideoEncodeAcceleratorTestEnvironment( 1787 new content::VideoEncodeAcceleratorTestEnvironment(
1788 std::move(test_stream_data), log_path, run_at_fps, 1788 std::move(test_stream_data), log_path, run_at_fps,
1789 needs_encode_latency, verify_all_output))); 1789 needs_encode_latency, verify_all_output)));
1790 1790
1791 return RUN_ALL_TESTS(); 1791 return RUN_ALL_TESTS();
1792 } 1792 }
OLDNEW
« no previous file with comments | « chromecast/media/cma/decoder/cast_audio_decoder_linux.cc ('k') | content/renderer/pepper/video_decoder_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698