Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
1d503fa5
Commit
1d503fa5
authored
Nov 01, 2016
by
杨培
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复视频转码时,原视频编码不一致未作为主要参数导致未正确转码的问题
后台视频详情页增加视频信息调试链接
parent
b7f8ed91
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
4 deletions
+15
-4
CourseController.php
src/backend/controllers/CourseController.php
+4
-1
detail.php
src/backend/views/course/detail.php
+8
-1
QiniuTranscode.php
src/common/libs/QiniuTranscode.php
+3
-2
No files found.
src/backend/controllers/CourseController.php
View file @
1d503fa5
...
@@ -77,8 +77,11 @@ class CourseController extends Controller
...
@@ -77,8 +77,11 @@ class CourseController extends Controller
$qiniu
=
\Yii
::
$app
->
qiniu
;
$qiniu
=
\Yii
::
$app
->
qiniu
;
$previewUrl
=
$qiniu
->
getUrl
(
'public'
,
$course
->
preview_pic
);
$previewUrl
=
$qiniu
->
getUrl
(
'public'
,
$course
->
preview_pic
);
$sourceUrl
=
$qiniu
->
getUrl
(
'video'
,
$courseware
->
name
);
$sourceUrl
=
$qiniu
->
getUrl
(
'video'
,
$courseware
->
name
);
$baseUrl
=
$qiniu
->
getStorageConfig
(
'video'
,
'url'
)
.
$courseware
->
name
;
$avUrl
=
$qiniu
->
getAuthInstance
()
->
privateDownloadUrl
(
$baseUrl
.
'?avinfo'
);
return
$this
->
render
(
'detail'
,
compact
(
'course'
,
'courseware'
,
'class'
,
'previewUrl'
,
'sourceUrl'
));
return
$this
->
render
(
'detail'
,
compact
(
'course'
,
'courseware'
,
'class'
,
'previewUrl'
,
'sourceUrl'
,
'avUrl'
));
}
}
/**
/**
...
...
src/backend/views/course/detail.php
View file @
1d503fa5
<?php
<?php
/**
/**
* @var $class \common\models\Classes
* @var $course \common\models\Course
* @var $course \common\models\Course
* @var $previewUrl string
* @var $sourceUrl string
* @var $avUrl string
*/
*/
use
yii\helpers\Html
;
use
yii\helpers\Html
;
...
@@ -11,4 +15,7 @@ $this->title = $course->name;
...
@@ -11,4 +15,7 @@ $this->title = $course->name;
<p>
<?=
$class
->
name
?>
</p>
<p>
<?=
$class
->
name
?>
</p>
<div><img
src=
"
<?=
$previewUrl
?>
-m.preview"
></div>
<div><img
src=
"
<?=
$previewUrl
?>
-m.preview"
></div>
<div>
<?=
$course
->
intro
?>
</div>
<div>
<?=
$course
->
intro
?>
</div>
<p>
[
<a
href=
"
<?=
$sourceUrl
?>
"
target=
"_blank"
>
下载源视频
</a>
]
</p>
<p>
\ No newline at end of file
[
<a
href=
"
<?=
$sourceUrl
?>
"
target=
"_blank"
>
下载源视频
</a>
]
[
<a
href=
"
<?=
$avUrl
?>
"
target=
"_blank"
>
AVINFO
</a>
]
</p>
\ No newline at end of file
src/common/libs/QiniuTranscode.php
View file @
1d503fa5
...
@@ -145,8 +145,9 @@ class QiniuTranscode
...
@@ -145,8 +145,9 @@ class QiniuTranscode
//FPS 对比
//FPS 对比
//Todo: 目前FPS的测算方法都不是很正确,不管是 r_frame_rate 还是 avg_frame_rate 多种情况下结果不正确,还需要继续研究
//Todo: 目前FPS的测算方法都不是很正确,不管是 r_frame_rate 还是 avg_frame_rate 多种情况下结果不正确,还需要继续研究
//因为预算不是很正确,所以在 FPS 在于目标值并超过 10 以上时才转换
$frate
=
explode
(
'/'
,
$video
[
'avg_frame_rate'
]);
$frate
=
explode
(
'/'
,
$video
[
'avg_frame_rate'
]);
if
(
$frate
[
0
]
/
$frate
[
1
]
>
$target
[
'fps'
])
{
if
(
$frate
[
0
]
/
$frate
[
1
]
>
$target
[
'fps'
]
+
10
)
{
$fopsMain
.=
'/r/'
.
$target
[
'fps'
];
$fopsMain
.=
'/r/'
.
$target
[
'fps'
];
}
}
...
@@ -191,7 +192,7 @@ class QiniuTranscode
...
@@ -191,7 +192,7 @@ class QiniuTranscode
$fops
=
''
;
$fops
=
''
;
//如果视频不是目标格式,或有必要参数,则进行转码
//如果视频不是目标格式,或有必要参数,则进行转码
if
(
$force
||
strpos
(
$avInfo
[
'format'
][
'format_name'
],
self
::
TARGET_FORMAT
)
===
false
)
{
if
(
$force
||
$fopsMain
||
strpos
(
$avInfo
[
'format'
][
'format_name'
],
self
::
TARGET_FORMAT
)
===
false
)
{
$fops
=
'avthumb/'
.
self
::
TARGET_FORMAT
.
$fopsMain
.
$fopsAddon
;
$fops
=
'avthumb/'
.
self
::
TARGET_FORMAT
.
$fopsMain
.
$fopsAddon
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment