Skip to content

Commit

Permalink
remove nvenc (not implemented) and nvcuda (unstable) for now
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@4130 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Aug 9, 2013
1 parent 196ba9b commit 7040ae2
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/xpra/codecs/video_enc_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
log = Logger()
debug = debug_if_env(log, "XPRA_VIDEOPIPELINE_DEBUG")

from xpra.scripts.config import csc_swscale, enc_vpx, enc_x264, enc_nvenc, csc_nvcuda
from xpra.scripts.config import csc_swscale, enc_vpx, enc_x264


class VideoPipelineHelper(object):
Expand Down Expand Up @@ -41,10 +41,10 @@ def init_video_encoders_options(self):
self.init_video_encoder_option("x264", enc_x264)
except:
log.warn("init_video_encoders_options() cannot add x264 encoder", exc_info=True)
try:
self.init_video_encoder_option("nvenc", enc_nvenc)
except:
log.warn("init_video_encoders_options() cannot add nvenc encoder", exc_info=True)
#try:
# self.init_video_encoder_option("nvenc", enc_nvenc)
#except:
# log.warn("init_video_encoders_options() cannot add nvenc encoder", exc_info=True)
debug("init_video_encoders_options() video encoder specs: %s", self._video_encoder_specs)

def init_video_encoder_option(self, encoding, encoder_module):
Expand All @@ -63,10 +63,10 @@ def init_csc_options(self):
self.init_csc_option(csc_swscale)
except:
log.warn("init_csc_options() cannot add swscale csc", exc_info=True)
try:
self.init_csc_option(csc_nvcuda)
except:
log.warn("init_csc_options() cannot add nvcuda csc", exc_info=True)
#try:
# self.init_csc_option(csc_nvcuda)
#except:
# log.warn("init_csc_options() cannot add nvcuda csc", exc_info=True)
debug("init_csc_options() csc specs: %s", self._csc_encoder_specs)

def init_csc_option(self, csc_module):
Expand Down

0 comments on commit 7040ae2

Please sign in to comment.