current/SOURCES/0139-dvdplayer-Recalculate-codecname-when-we-update-based.patch

From a6b8ad565a01d399e9bfa35216a4c2d2b08bc8db Mon Sep 17 00:00:00 2001
From: elupus <elupus@xbmc.org>
Date: Mon, 2 Apr 2012 23:01:42 +0200
Subject: [PATCH 139/145] [dvdplayer] Recalculate codecname when we update
 based on hw (cherry picked from commit
 8033cb5d7b5a6739eb0864d184e25c09ce18e1cf)

---
 .../dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp    |    9 +--------
 .../dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h      |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
index 256bc8b..7ac6b6b 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
@@ -299,14 +299,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options
   m_pFrame = m_dllAvCodec.avcodec_alloc_frame();
   if (!m_pFrame) return false;
 
-  if(pCodec->name)
-    m_name = CStdString("ff-") + pCodec->name;
-  else
-    m_name = "ffmpeg";
-
-  if(m_pHardware)
-    m_name += "-" + m_pHardware->Name();
-
+  UpdateName();
   return true;
 }
 
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
index b9cbd9a..b958509 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
@@ -68,8 +68,7 @@ public:
   {
     SAFE_RELEASE(m_pHardware);
     m_pHardware = hardware;
-    m_name += "-";
-    m_name += m_pHardware->Name();
+    UpdateName();
   }
 
 protected:
@@ -79,6 +78,17 @@ protected:
   void FilterClose();
   int  FilterProcess(AVFrame* frame);
 
+  void UpdateName()
+  {
+    if(m_pCodecContext->codec->name)
+      m_name = CStdString("ff-") + m_pCodecContext->codec->name;
+    else
+      m_name = "ffmpeg";
+
+    if(m_pHardware)
+      m_name += "-" + m_pHardware->Name();
+  }
+
   AVFrame* m_pFrame;
   AVCodecContext* m_pCodecContext;
 
-- 
1.7.10

1	From a6b8ad565a01d399e9bfa35216a4c2d2b08bc8db Mon Sep 17 00:00:00 2001
2	From: elupus <elupus@xbmc.org>
3	Date: Mon, 2 Apr 2012 23:01:42 +0200
4	Subject: [PATCH 139/145] [dvdplayer] Recalculate codecname when we update
5	based on hw (cherry picked from commit
6	8033cb5d7b5a6739eb0864d184e25c09ce18e1cf)
7
8	---
9	.../dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp \| 9 +--------
10	.../dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h \| 14 ++++++++++++--
11	2 files changed, 13 insertions(+), 10 deletions(-)
12
13	diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
14	index 256bc8b..7ac6b6b 100644
15	--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
16	+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
17	@@ -299,14 +299,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options
18	m_pFrame = m_dllAvCodec.avcodec_alloc_frame();
19	if (!m_pFrame) return false;
20
21	- if(pCodec->name)
22	- m_name = CStdString("ff-") + pCodec->name;
23	- else
24	- m_name = "ffmpeg";
25	-
26	- if(m_pHardware)
27	- m_name += "-" + m_pHardware->Name();
28	-
29	+ UpdateName();
30	return true;
31	}
32
33	diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
34	index b9cbd9a..b958509 100644
35	--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
36	+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
37	@@ -68,8 +68,7 @@ public:
38	{
39	SAFE_RELEASE(m_pHardware);
40	m_pHardware = hardware;
41	- m_name += "-";
42	- m_name += m_pHardware->Name();
43	+ UpdateName();
44	}
45
46	protected:
47	@@ -79,6 +78,17 @@ protected:
48	void FilterClose();
49	int FilterProcess(AVFrame* frame);
50
51	+ void UpdateName()
52	+ {
53	+ if(m_pCodecContext->codec->name)
54	+ m_name = CStdString("ff-") + m_pCodecContext->codec->name;
55	+ else
56	+ m_name = "ffmpeg";
57	+
58	+ if(m_pHardware)
59	+ m_name += "-" + m_pHardware->Name();
60	+ }
61	+
62	AVFrame* m_pFrame;
63	AVCodecContext* m_pCodecContext;
64
65	--
66	1.7.10
67