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

Side by Side Diff: webrtc/modules/video_render/windows/video_render_direct3d9.cc

Issue 1232713002: Removed unused variables and the need to include the d3dx9.h file. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added BroadSoft to the AUTHORS file. Created 5 years, 5 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
« no previous file with comments | « webrtc/modules/video_render/windows/video_render_direct3d9.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 // Clear the backbuffer to a black color 595 // Clear the backbuffer to a black color
596 _pd3dDevice->Clear(0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 596 _pd3dDevice->Clear(0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f,
597 0); 597 0);
598 598
599 // Begin the scene 599 // Begin the scene
600 if (SUCCEEDED(_pd3dDevice->BeginScene())) 600 if (SUCCEEDED(_pd3dDevice->BeginScene()))
601 { 601 {
602 _pd3dDevice->SetStreamSource(0, _pVB, 0, sizeof(CUSTOMVERTEX)); 602 _pd3dDevice->SetStreamSource(0, _pVB, 0, sizeof(CUSTOMVERTEX));
603 _pd3dDevice->SetFVF(D3DFVF_CUSTOMVERTEX); 603 _pd3dDevice->SetFVF(D3DFVF_CUSTOMVERTEX);
604 604
605 D3DXMATRIX matWorld;
606 D3DXMATRIX matWorldTemp;
607
608 //draw all the channels 605 //draw all the channels
609 //get texture from the channels 606 //get texture from the channels
610 LPDIRECT3DTEXTURE9 textureFromChannel = NULL; 607 LPDIRECT3DTEXTURE9 textureFromChannel = NULL;
611 DWORD textureWidth, textureHeight; 608 DWORD textureWidth, textureHeight;
612 609
613 std::multimap<int, unsigned int>::reverse_iterator it; 610 std::multimap<int, unsigned int>::reverse_iterator it;
614 it = _d3dZorder.rbegin(); 611 it = _d3dZorder.rbegin();
615 while (it != _d3dZorder.rend()) 612 while (it != _d3dZorder.rend())
616 { 613 {
617 // loop through all channels and streams in Z order 614 // loop through all channels and streams in Z order
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 "Direct3D render failed to find channel"); 1157 "Direct3D render failed to find channel");
1161 return -1; 1158 return -1;
1162 } 1159 }
1163 // Only allow one stream per channel, demuxing is 1160 // Only allow one stream per channel, demuxing is
1164 ddobj->SetStreamSettings(0, zOrder, left, top, right, bottom); 1161 ddobj->SetStreamSettings(0, zOrder, left, top, right, bottom);
1165 1162
1166 return 0; 1163 return 0;
1167 } 1164 }
1168 1165
1169 } // namespace webrtc 1166 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_render/windows/video_render_direct3d9.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698