| Index: media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc
|
| diff --git a/media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc b/media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc
|
| index f245dd5290985a4a1b22cdc6a7d66f8d9921fac7..5a1f3994e21597282489467867bcd0939bab73dc 100644
|
| --- a/media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc
|
| +++ b/media/gpu/ipc/client/gpu_video_encode_accelerator_host.cc
|
| @@ -239,7 +239,7 @@ void GpuVideoEncodeAcceleratorHost::OnRequireBitstreamBuffers(
|
| const gfx::Size& input_coded_size,
|
| uint32_t output_buffer_size) {
|
| DCHECK(CalledOnValidThread());
|
| - DVLOG(2) << __FUNCTION__ << " input_count=" << input_count
|
| + DVLOG(2) << __func__ << " input_count=" << input_count
|
| << ", input_coded_size=" << input_coded_size.ToString()
|
| << ", output_buffer_size=" << output_buffer_size;
|
| if (client_) {
|
| @@ -250,7 +250,7 @@ void GpuVideoEncodeAcceleratorHost::OnRequireBitstreamBuffers(
|
|
|
| void GpuVideoEncodeAcceleratorHost::OnNotifyInputDone(int32_t frame_id) {
|
| DCHECK(CalledOnValidThread());
|
| - DVLOG(3) << __FUNCTION__ << " frame_id=" << frame_id;
|
| + DVLOG(3) << __func__ << " frame_id=" << frame_id;
|
| // Fun-fact: std::hash_map is not spec'd to be re-entrant; since freeing a
|
| // frame can trigger a further encode to be kicked off and thus an .insert()
|
| // back into the map, we separate the frame's dtor running from the .erase()
|
| @@ -258,7 +258,7 @@ void GpuVideoEncodeAcceleratorHost::OnNotifyInputDone(int32_t frame_id) {
|
| // theoretical" - Android's std::hash_map crashes if we don't do this.
|
| scoped_refptr<VideoFrame> frame = frame_map_[frame_id];
|
| if (!frame_map_.erase(frame_id)) {
|
| - DLOG(ERROR) << __FUNCTION__ << " invalid frame_id=" << frame_id;
|
| + DLOG(ERROR) << __func__ << " invalid frame_id=" << frame_id;
|
| // See OnNotifyError for why this needs to be the last thing in this
|
| // function.
|
| OnNotifyError(kPlatformFailureError);
|
| @@ -274,7 +274,7 @@ void GpuVideoEncodeAcceleratorHost::OnBitstreamBufferReady(
|
| bool key_frame,
|
| base::TimeDelta timestamp) {
|
| DCHECK(CalledOnValidThread());
|
| - DVLOG(3) << __FUNCTION__ << " bitstream_buffer_id=" << bitstream_buffer_id
|
| + DVLOG(3) << __func__ << " bitstream_buffer_id=" << bitstream_buffer_id
|
| << ", payload_size=" << payload_size << ", key_frame=" << key_frame;
|
| if (client_)
|
| client_->BitstreamBufferReady(bitstream_buffer_id, payload_size, key_frame,
|
| @@ -283,7 +283,7 @@ void GpuVideoEncodeAcceleratorHost::OnBitstreamBufferReady(
|
|
|
| void GpuVideoEncodeAcceleratorHost::OnNotifyError(Error error) {
|
| DCHECK(CalledOnValidThread());
|
| - DLOG(ERROR) << __FUNCTION__ << " error=" << error;
|
| + DLOG(ERROR) << __func__ << " error=" << error;
|
| if (!client_)
|
| return;
|
| weak_this_factory_.InvalidateWeakPtrs();
|
|
|