| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 | 415 |
| 416 if (!m_contentMIMEType.isEmpty()) | 416 if (!m_contentMIMEType.isEmpty()) |
| 417 engine = bestMediaEngineForTypeAndCodecs(m_contentMIMEType, m_contentTyp
eCodecs, m_keySystem, m_url, current); | 417 engine = bestMediaEngineForTypeAndCodecs(m_contentMIMEType, m_contentTyp
eCodecs, m_keySystem, m_url, current); |
| 418 | 418 |
| 419 // If no MIME type is specified or the type was inferred from the file exten
sion, just use the next engine. | 419 // If no MIME type is specified or the type was inferred from the file exten
sion, just use the next engine. |
| 420 if (!engine && (m_contentMIMEType.isEmpty() || m_contentMIMETypeWasInferredF
romExtension)) | 420 if (!engine && (m_contentMIMEType.isEmpty() || m_contentMIMETypeWasInferredF
romExtension)) |
| 421 engine = nextMediaEngine(current); | 421 engine = nextMediaEngine(current); |
| 422 | 422 |
| 423 // Don't delete and recreate the player unless it comes from a different eng
ine. | 423 // Don't delete and recreate the player unless it comes from a different eng
ine. |
| 424 if (!engine) { | 424 if (!engine) { |
| 425 LOG(Media, "MediaPlayer::loadWithNextMediaEngine - no media engine found
for type \"%s\"", m_contentMIMEType.utf8().data()); | 425 LOG_INFO(Media, "MediaPlayer::loadWithNextMediaEngine - no media engine
found for type \"%s\"", m_contentMIMEType.utf8().data()); |
| 426 m_currentMediaEngine = engine; | 426 m_currentMediaEngine = engine; |
| 427 m_private = nullptr; | 427 m_private = nullptr; |
| 428 } else if (m_currentMediaEngine != engine) { | 428 } else if (m_currentMediaEngine != engine) { |
| 429 m_currentMediaEngine = engine; | 429 m_currentMediaEngine = engine; |
| 430 m_private = engine->constructor(this); | 430 m_private = engine->constructor(this); |
| 431 if (m_mediaPlayerClient) | 431 if (m_mediaPlayerClient) |
| 432 m_mediaPlayerClient->mediaPlayerEngineUpdated(this); | 432 m_mediaPlayerClient->mediaPlayerEngineUpdated(this); |
| 433 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) | 433 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) |
| 434 m_private->setMediaPlayerProxy(m_playerProxy); | 434 m_private->setMediaPlayerProxy(m_playerProxy); |
| 435 #endif | 435 #endif |
| (...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1150 if (!m_private) | 1150 if (!m_private) |
| 1151 return; | 1151 return; |
| 1152 | 1152 |
| 1153 m_private->simulateAudioInterruption(); | 1153 m_private->simulateAudioInterruption(); |
| 1154 } | 1154 } |
| 1155 #endif | 1155 #endif |
| 1156 | 1156 |
| 1157 } | 1157 } |
| 1158 | 1158 |
| 1159 #endif | 1159 #endif |
| OLD | NEW |