Encrypted Media: Fix PpbBuffer::Destroy().

media/cdm/ppapi/cdm_adapter.cc

Index: media/cdm/ppapi/cdm_adapter.cc
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc
index 10feef775442cd3f8dc658eb7e8fb5754ae69580..17128125a5fc3b64c66289a5fa02f08857a5c612 100644
--- a/media/cdm/ppapi/cdm_adapter.cc
+++ b/media/cdm/ppapi/cdm_adapter.cc
@@ -855,9 +855,9 @@ void CdmAdapter::DeliverBlock(int32_t result,
     } else {
       PpbBuffer* ppb_buffer =
           static_cast<PpbBuffer*>(decrypted_block->DecryptedBuffer());
-      buffer = ppb_buffer->buffer_dev();
       decrypted_block_info.tracking_info.buffer_id = ppb_buffer->buffer_id();
       decrypted_block_info.data_size = ppb_buffer->Size();
+      buffer = ppb_buffer->TakeBufferDev();

[xhwang, 2014/07/10 16:42:39]

This call also clears buffer_id and size. That's why I move it here. I thought
about some other names but still feel this is the best. Naming suggestions
welcome!

[ddorwin, 2014/07/10 21:56:14]

We never fixed the original naming. PpbBuffer isn't actually a PPB_Buffer_Dev.
*sigh*

I have no suggestions for that or this at the moment. We could probably drop the
"Dev" part of this new function name. Maybe it is differentiating the two
"buffers", but that's a crutch and we should solve the real problem. Maybe we
don't need to differentiate them, though. This is basically a deep move, leaving
the wrapper "empty".

[xhwang, 2014/07/10 22:37:33]

How about just BufferImpl, which is consistent with VideoFrameImpl.
 
Ok, I'll use TakeBuffer().

[ddorwin, 2014/07/10 22:43:24]

BufferImpl sounds good. In a different CL, of course.

[xhwang, 2014/07/10 22:48:50]

Will do.

     }
   }
 
@@ -908,8 +908,6 @@ void CdmAdapter::DeliverFrame(
       PpbBuffer* ppb_buffer =
           static_cast<PpbBuffer*>(video_frame->FrameBuffer());
 
-      buffer = ppb_buffer->buffer_dev();
-
       decrypted_frame_info.tracking_info.timestamp = video_frame->Timestamp();
       decrypted_frame_info.tracking_info.buffer_id = ppb_buffer->buffer_id();
       decrypted_frame_info.format =
@@ -928,6 +926,8 @@ void CdmAdapter::DeliverFrame(
           video_frame->Stride(cdm::VideoFrame::kUPlane);
       decrypted_frame_info.strides[PP_DECRYPTEDFRAMEPLANES_V] =
           video_frame->Stride(cdm::VideoFrame::kVPlane);
+
+      buffer = ppb_buffer->TakeBufferDev();
     }
   }
   pp::ContentDecryptor_Private::DeliverFrame(buffer, decrypted_frame_info);

[ddorwin, 2014/07/10 21:56:14]

nit: add an empty line for consistency (and because it's better IMO)

[xhwang, 2014/07/10 22:37:33]

Done.

@@ -956,11 +956,13 @@ void CdmAdapter::DeliverSamples(int32_t result,
     } else {
       PpbBuffer* ppb_buffer =
           static_cast<PpbBuffer*>(audio_frames->FrameBuffer());
-      buffer = ppb_buffer->buffer_dev();
+
       decrypted_sample_info.tracking_info.buffer_id = ppb_buffer->buffer_id();
       decrypted_sample_info.data_size = ppb_buffer->Size();
       decrypted_sample_info.format =
           CdmAudioFormatToPpDecryptedSampleFormat(audio_frames->Format());
+
+      buffer = ppb_buffer->TakeBufferDev();
     }
   }